rev 4657 - trunk/packages/kdesdk/debian/patches

Pierre Habouzit madcoder at costa.debian.org
Mon Oct 9 23:01:38 UTC 2006


Author: madcoder
Date: 2006-10-09 23:01:09 +0000 (Mon, 09 Oct 2006)
New Revision: 4657

Modified:
   trunk/packages/kdesdk/debian/patches/98_buildprep.diff
Log:
buildprep kdesdk

 98_buildprep.diff |19599 +++++++++++++++++++++---------------------------------
 1 file changed, 7945 insertions(+), 11654 deletions(-)



Modified: trunk/packages/kdesdk/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdesdk/debian/patches/98_buildprep.diff	2006-10-09 22:54:21 UTC (rev 4656)
+++ trunk/packages/kdesdk/debian/patches/98_buildprep.diff	2006-10-09 23:01:09 UTC (rev 4657)
@@ -1,7 +1,6 @@
-#DPATCHLEVEL=0
-# vi: ft=diff
---- acinclude.m4
-+++ acinclude.m4
+diff -ur kdesdk-3.5.5.old/acinclude.m4 kdesdk-3.5.5/acinclude.m4
+--- kdesdk-3.5.5.old/acinclude.m4	2006-10-02 20:28:03.000000000 +0200
++++ kdesdk-3.5.5/acinclude.m4	2006-10-10 00:57:45.000000000 +0200
 @@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
@@ -28,7 +27,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5973,30 +5961,15 @@
+@@ -5970,30 +5958,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +63,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6029,7 @@
+@@ -6053,7 +6026,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -73,7 +72,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6103,7 +6076,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -82,7 +81,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6123,7 +6096,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -91,7 +90,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6143,6 +6116,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -99,7 +98,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6139,17 @@
+@@ -6162,15 +6136,17 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -119,7 +118,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6214,11 +6190,56 @@
+@@ -6211,11 +6187,56 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -176,7 +175,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6291,15 +6312,15 @@
+@@ -6288,15 +6309,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -195,7 +194,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6468,14 +6489,13 @@
+@@ -6465,14 +6486,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +211,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6484,7 +6504,6 @@
        esac
        ;;
      *64-bit*)
@@ -220,7 +219,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6518,6 +6537,22 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -243,7 +242,7 @@
  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
  [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6587,7 @@
+@@ -6549,7 +6584,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -252,7 +251,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6562,8 +6597,10 @@
+@@ -6559,8 +6594,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
@@ -265,7 +264,7 @@
         $2=yes
       fi
     fi
-@@ -6589,11 +6626,16 @@
+@@ -6586,11 +6623,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +282,7 @@
       else
         $2=yes
       fi
-@@ -6617,7 +6659,7 @@
+@@ -6614,7 +6656,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -292,7 +291,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6643,20 +6685,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -369,7 +368,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6676,7 +6768,7 @@
+@@ -6673,7 +6765,7 @@
  
  
  # _LT_AC_CHECK_DLFCN
@@ -378,7 +377,7 @@
  AC_DEFUN([_LT_AC_CHECK_DLFCN],
  [AC_CHECK_HEADERS(dlfcn.h)dnl
  ])# _LT_AC_CHECK_DLFCN
-@@ -6684,7 +6776,7 @@
+@@ -6681,7 +6773,7 @@
  
  # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
  #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +386,7 @@
  AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6842,19 @@
+@@ -6747,17 +6839,19 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -409,7 +408,7 @@
      esac
    else :
      # compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6769,7 +6863,7 @@
  
  
  # AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +417,7 @@
  AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "x$enable_dlopen" != xyes; then
-@@ -6809,7 +6903,7 @@
+@@ -6806,7 +6900,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -427,7 +426,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6840,7 +6934,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -436,7 +435,7 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6950,7 @@
+@@ -6853,7 +6947,7 @@
      ])
  
      if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +444,7 @@
        AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
      	  lt_cv_dlopen_self_static, [dnl
  	  _LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +6992,13 @@
+@@ -6895,20 +6989,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -467,7 +466,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6923,13 +7010,18 @@
+@@ -6920,13 +7007,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -490,7 +489,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6985,8 +7077,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +500,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7043,7 +7135,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -510,7 +509,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7059,7 +7151,7 @@
+@@ -7056,7 +7148,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -519,7 +518,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7066,7 +7158,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +540,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7134,7 +7239,7 @@
+@@ -7131,7 +7236,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +549,7 @@
    ;;
  
  beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7140,7 +7245,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -559,7 +558,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7159,7 +7264,7 @@
+@@ -7156,7 +7261,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -568,7 +567,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7171,7 +7276,8 @@
+@@ -7168,7 +7273,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +577,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7198,7 +7304,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +586,7 @@
        ;;
      esac
      ;;
-@@ -7224,7 +7330,7 @@
+@@ -7221,7 +7327,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +595,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7247,20 +7353,17 @@
+@@ -7244,20 +7350,17 @@
    dynamic_linker=no
    ;;
  
@@ -628,7 +627,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7278,14 +7381,19 @@
+@@ -7275,14 +7378,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -650,7 +649,7 @@
    esac
    ;;
  
-@@ -7305,9 +7413,9 @@
+@@ -7302,9 +7410,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -662,7 +661,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7322,7 +7430,7 @@
+@@ -7319,7 +7427,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -671,7 +670,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7333,7 +7441,7 @@
+@@ -7330,7 +7438,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -680,7 +679,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7345,6 +7453,18 @@
+@@ -7342,6 +7450,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -699,7 +698,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7508,26 @@
+@@ -7385,29 +7505,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -736,7 +735,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7420,6 +7537,18 @@
+@@ -7417,6 +7534,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -755,7 +754,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7429,7 +7558,7 @@
+@@ -7426,7 +7555,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -764,7 +763,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7457,8 +7586,13 @@
+@@ -7454,8 +7583,13 @@
  
  openbsd*)
    version_type=sunos
@@ -779,7 +778,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7478,7 +7612,7 @@
+@@ -7475,7 +7609,7 @@
  
  os2*)
    libname_spec='$name'
@@ -788,7 +787,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7496,13 +7630,6 @@
+@@ -7493,13 +7627,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -802,7 +801,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -7528,7 +7655,7 @@
+@@ -7525,7 +7652,7 @@
    need_version=yes
    ;;
  
@@ -811,7 +810,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7561,6 +7688,29 @@
+@@ -7558,6 +7685,29 @@
    fi
    ;;
  
@@ -841,7 +840,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7574,6 +7724,11 @@
+@@ -7571,6 +7721,11 @@
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +852,7 @@
  ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
  
-@@ -7598,6 +7753,9 @@
+@@ -7595,6 +7750,9 @@
        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
      fi
    fi
@@ -863,7 +862,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -7624,7 +7782,9 @@
+@@ -7621,7 +7779,9 @@
  
        case $tagname in
        CXX)
@@ -874,7 +873,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7686,7 +7846,7 @@
+@@ -7683,7 +7843,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -883,7 +882,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7724,7 +7884,7 @@
+@@ -7721,7 +7881,7 @@
  
  # AC_DISABLE_SHARED
  # -----------------
@@ -892,7 +891,7 @@
  AC_DEFUN([AC_DISABLE_SHARED],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_ENABLE_SHARED(no)
-@@ -7860,7 +8020,7 @@
+@@ -7857,7 +8017,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -901,7 +900,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -7970,7 +8130,7 @@
+@@ -7967,7 +8127,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -910,7 +909,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -8002,7 +8162,7 @@
+@@ -7999,7 +8159,7 @@
  AC_DEFUN([AC_PROG_LD_GNU],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -919,7 +918,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8189,15 @@
+@@ -8026,6 +8186,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +934,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8062,44 +8231,36 @@
+@@ -8059,44 +8228,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -991,7 +990,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8115,7 +8276,7 @@
+@@ -8112,7 +8273,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +999,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8131,43 +8292,27 @@
+@@ -8128,43 +8289,27 @@
    esac
    ;;
  
@@ -1057,7 +1056,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -8186,32 +8331,22 @@
+@@ -8183,32 +8328,22 @@
    ;;
  
  openbsd*)
@@ -1093,7 +1092,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8232,10 +8367,13 @@
+@@ -8229,10 +8364,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1108,7 +1107,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -8255,36 +8393,43 @@
+@@ -8252,36 +8390,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -1176,7 +1175,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi])
  NM="$lt_cv_path_NM"
-@@ -8316,13 +8461,13 @@
+@@ -8313,13 +8458,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1196,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8341,13 +8486,13 @@
+@@ -8338,13 +8483,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1217,7 @@
  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
  AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8385,10 +8530,21 @@
+@@ -8382,10 +8527,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1240,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8428,7 +8584,7 @@
+@@ -8425,7 +8581,7 @@
  
  
  # AC_LIBTOOL_RC
@@ -1250,7 +1249,7 @@
  # enable support for Windows resource files
  AC_DEFUN([AC_LIBTOOL_RC],
  [AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8461,36 +8617,9 @@
+@@ -8458,36 +8614,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1290,7 +1289,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8633,9 @@
+@@ -8501,9 +8630,9 @@
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
  AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1301,7 @@
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
  
-@@ -8515,7 +8644,7 @@
+@@ -8512,7 +8641,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1311,7 +1310,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8524,48 +8653,11 @@
+@@ -8521,48 +8650,11 @@
    fi
    ;;
  
@@ -1362,7 +1361,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8590,7 +8682,7 @@
+@@ -8587,7 +8679,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1370,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8694,7 @@
+@@ -8599,6 +8691,7 @@
  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1378,7 @@
  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
  _LT_AC_TAGVAR(module_cmds, $1)=
  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8712,7 @@
+@@ -8616,7 +8709,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1388,7 +1387,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8629,11 +8722,15 @@
+@@ -8626,11 +8719,15 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -1405,7 +1404,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8644,18 +8741,18 @@
+@@ -8641,18 +8738,18 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -1427,7 +1426,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8673,8 +8770,8 @@
+@@ -8670,8 +8767,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -1438,7 +1437,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8700,7 +8797,7 @@
+@@ -8697,7 +8794,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -1447,7 +1446,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8827,23 @@
+@@ -8727,8 +8824,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1473,7 +1472,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8748,7 +8860,7 @@
+@@ -8745,7 +8857,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1482,7 +1481,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -8767,8 +8879,12 @@
+@@ -8764,8 +8876,12 @@
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
@@ -1495,7 +1494,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8777,15 +8893,16 @@
+@@ -8774,15 +8890,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1515,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -8794,13 +8911,12 @@
+@@ -8791,13 +8908,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1532,7 +1531,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,22 +8925,32 @@
+@@ -8806,22 +8922,32 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1575,7 @@
      esac
      ;;
  
-@@ -8832,12 +8958,12 @@
+@@ -8829,12 +8955,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1591,7 +1590,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8846,70 +8972,81 @@
+@@ -8843,70 +8969,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1725,7 +1724,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8920,14 +9057,14 @@
+@@ -8917,14 +9054,14 @@
  	;;
      esac
      ;;
@@ -1742,7 +1741,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8944,12 +9081,12 @@
+@@ -8941,12 +9078,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1758,7 +1757,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8958,11 +9095,11 @@
+@@ -8955,11 +9092,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -1772,7 +1771,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9109,23 @@
+@@ -8969,34 +9106,23 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1814,7 +1813,7 @@
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9009,17 +9135,20 @@
+@@ -9006,17 +9132,20 @@
      esac
  
      case $cc_basename in
@@ -1841,7 +1840,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9164,15 @@
+@@ -9032,12 +9161,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1861,7 +1860,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -9051,11 +9183,25 @@
+@@ -9048,11 +9180,25 @@
  	;;
      esac
      ;;
@@ -1889,7 +1888,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9066,9 +9212,9 @@
+@@ -9063,9 +9209,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1901,7 +1900,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9077,16 +9223,16 @@
+@@ -9074,16 +9220,16 @@
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
@@ -1922,7 +1921,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9104,20 +9250,44 @@
+@@ -9101,20 +9247,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1973,7 +1972,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9315,7 @@
+@@ -9142,7 +9312,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1982,7 +1981,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9155,7 +9325,7 @@
+@@ -9152,7 +9322,7 @@
  	;;
      esac
      ;;
@@ -1991,7 +1990,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -9166,15 +9336,31 @@
+@@ -9163,15 +9333,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -2025,7 +2024,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9370,14 @@
+@@ -9181,14 +9367,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -2043,7 +2042,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9395,7 @@
+@@ -9206,7 +9392,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2051,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9414,13 @@
+@@ -9225,13 +9411,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -2068,7 +2067,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9429,17 @@
+@@ -9240,17 +9426,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -2090,7 +2089,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9458,7 @@
+@@ -9269,7 +9455,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2098,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9479,14 @@
+@@ -9290,27 +9476,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -2129,7 +2128,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9499,33 @@
+@@ -9323,36 +9496,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -2178,7 +2177,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9363,9 +9533,9 @@
+@@ -9360,9 +9530,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -2190,7 +2189,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9375,9 +9545,9 @@
+@@ -9372,9 +9542,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2202,7 +2201,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9556,9 @@
+@@ -9383,9 +9553,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -2214,7 +2213,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9571,63 @@
+@@ -9398,12 +9568,63 @@
  	;;
      esac
      ;;
@@ -2280,7 +2279,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9664,6 @@
+@@ -9440,8 +9661,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2288,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9462,7 +9681,7 @@
+@@ -9459,7 +9678,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2297,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -9516,7 +9735,7 @@
+@@ -9513,7 +9732,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -2307,7 +2306,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9553,7 +9772,7 @@
         fi
         ;;
  
@@ -2316,7 +2315,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9592,13 +9811,37 @@
+@@ -9589,13 +9808,37 @@
  
  $rm -f confest.$objext
  
@@ -2355,7 +2354,7 @@
  # Ensure that the configuration vars for the C compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9642,12 +9885,16 @@
+@@ -9639,12 +9882,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2373,7 +2372,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9904,7 @@
+@@ -9654,7 +9901,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2382,7 +2381,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9665,8 +9912,10 @@
+@@ -9662,8 +9909,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2395,7 +2394,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9925,6 @@
+@@ -9673,8 +9922,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2404,7 +2403,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -9687,8 +9934,6 @@
+@@ -9684,8 +9931,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2412,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9717,20 +9962,27 @@
+@@ -9714,20 +9959,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2442,7 +2441,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -9742,8 +9994,6 @@
+@@ -9739,8 +9991,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2450,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9753,7 +10003,7 @@
+@@ -9750,7 +10000,7 @@
  
  
  # AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2459,7 @@
  # Ensure that the configuration vars for the Windows resource compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9777,11 +10027,16 @@
+@@ -9774,11 +10024,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2477,7 +2476,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10062,12 @@
+@@ -9804,11 +10059,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2492,7 +2491,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9861,7 +10117,7 @@
+@@ -9858,7 +10114,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2500,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9927,11 +10183,11 @@
+@@ -9924,11 +10180,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2514,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9962,6 +10218,12 @@
+@@ -9959,6 +10215,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2528,7 +2527,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9973,6 +10235,9 @@
+@@ -9970,6 +10232,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2538,7 +2537,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -9992,7 +10257,7 @@
+@@ -9989,7 +10254,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2547,7 +2546,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10288,7 @@
+@@ -10020,7 +10285,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2556,7 +2555,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10038,7 +10303,7 @@
+@@ -10035,7 +10300,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2565,7 +2564,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10267,7 +10532,10 @@
+@@ -10264,7 +10529,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -2577,7 +2576,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10309,9 +10577,6 @@
+@@ -10306,9 +10574,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2587,7 +2586,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -10333,14 +10598,30 @@
+@@ -10330,14 +10595,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -2620,7 +2619,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10358,14 +10639,17 @@
+@@ -10355,14 +10636,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2640,7 +2639,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10521,6 +10805,10 @@
+@@ -10518,6 +10802,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2651,7 +2650,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10817,7 @@
+@@ -10526,7 +10814,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2660,7 +2659,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10554,18 +10842,28 @@
+@@ -10551,18 +10839,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2692,7 +2691,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10573,22 +10871,22 @@
+@@ -10570,22 +10868,22 @@
  	    ;;
  	esac
  	;;
@@ -2721,7 +2720,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10601,9 +10899,13 @@
+@@ -10598,9 +10896,13 @@
  	    ;;
  	esac
  	;;
@@ -2736,7 +2735,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -10612,20 +10914,26 @@
+@@ -10609,20 +10911,26 @@
  	    ;;
  	esac
  	;;
@@ -2768,7 +2767,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10642,25 +10950,25 @@
+@@ -10639,25 +10947,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2799,7 +2798,7 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10674,24 +10982,15 @@
+@@ -10671,24 +10979,15 @@
  	;;
        psos*)
  	;;
@@ -2826,7 +2825,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10701,12 +11000,12 @@
+@@ -10698,12 +10997,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2841,7 +2840,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10716,7 +11015,7 @@
+@@ -10713,7 +11012,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2850,7 +2849,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10724,7 +11023,14 @@
+@@ -10721,7 +11020,14 @@
  	    ;;
  	esac
  	;;
@@ -2866,7 +2865,7 @@
  	;;
        vxworks*)
  	;;
-@@ -10771,6 +11077,11 @@
+@@ -10768,6 +11074,11 @@
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
        ;;
  
@@ -2878,7 +2877,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -10787,7 +11098,7 @@
+@@ -10784,7 +11095,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2887,7 +2886,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10813,6 +11124,16 @@
+@@ -10810,6 +11121,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2904,7 +2903,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11145,7 @@
+@@ -10821,7 +11142,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2913,7 +2912,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10847,13 +11168,20 @@
+@@ -10844,13 +11165,20 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2936,7 +2935,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10868,15 +11196,15 @@
+@@ -10865,15 +11193,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2958,7 +2957,7 @@
        ;;
  
      sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10882,7 +11210,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2967,7 +2966,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10898,6 +11226,17 @@
+@@ -10895,6 +11223,17 @@
        fi
        ;;
  
@@ -2985,7 +2984,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10925,7 +11264,7 @@
+@@ -10922,7 +11261,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2994,7 +2993,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11273,16 @@
+@@ -10931,6 +11270,16 @@
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -3011,7 +3010,7 @@
  ])
  
  
-@@ -10958,7 +11307,10 @@
+@@ -10955,7 +11304,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -3023,7 +3022,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10984,7 +11336,7 @@
+@@ -10981,7 +11333,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3031,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -11001,7 +11353,8 @@
+@@ -10998,7 +11350,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -3042,7 +3041,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11364,10 @@
+@@ -11008,6 +11361,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -3053,7 +3052,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -11021,6 +11378,27 @@
+@@ -11018,6 +11375,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -3081,7 +3080,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11058,7 +11436,7 @@
+@@ -11055,7 +11433,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -3090,7 +3089,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11068,13 +11446,13 @@
+@@ -11065,13 +11443,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3107,7 +3106,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11083,23 +11461,70 @@
+@@ -11080,23 +11458,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -3184,7 +3183,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<EOF 1>&2
-@@ -11113,13 +11538,40 @@
+@@ -11110,13 +11535,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3226,7 @@
      sunos4*)
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -11129,24 +11581,19 @@
+@@ -11126,24 +11578,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3258,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11158,7 +11605,7 @@
+@@ -11155,7 +11602,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3267,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11627,21 @@
+@@ -11177,9 +11624,21 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -3292,7 +3291,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11199,7 +11658,7 @@
+@@ -11196,7 +11655,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3301,7 +3300,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -11218,8 +11677,12 @@
+@@ -11215,8 +11674,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3314,7 +3313,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11227,30 +11690,30 @@
+@@ -11224,30 +11687,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3356,7 +3355,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11722,11 @@
+@@ -11256,13 +11719,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3372,7 @@
  	fi
        fi
        ;;
-@@ -11278,7 +11739,7 @@
+@@ -11275,7 +11736,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3382,7 +3381,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11288,69 +11749,69 @@
+@@ -11285,69 +11746,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3497,7 @@
        ;;
  
      dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11380,8 +11841,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3508,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11392,7 +11853,7 @@
+@@ -11389,7 +11850,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -3518,7 +3517,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11406,47 +11867,62 @@
+@@ -11403,47 +11864,62 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        ;;
  
@@ -3605,7 +3604,7 @@
  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
-@@ -11460,7 +11936,7 @@
+@@ -11457,7 +11933,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -3614,7 +3613,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11470,7 +11946,7 @@
+@@ -11467,7 +11943,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -3623,7 +3622,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11493,7 +11969,8 @@
+@@ -11490,7 +11966,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3633,7 +3632,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11503,7 +11980,7 @@
+@@ -11500,7 +11977,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -3642,7 +3641,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11514,14 +11991,14 @@
+@@ -11511,14 +11988,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3659,7 +3658,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11533,13 +12010,13 @@
+@@ -11530,13 +12007,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3675,7 +3674,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12024,15 @@
+@@ -11544,21 +12021,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3701,7 +3700,7 @@
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11570,8 +12041,18 @@
+@@ -11567,8 +12038,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3721,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11580,7 +12061,7 @@
+@@ -11577,7 +12058,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -3731,7 +3730,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11628,36 +12109,45 @@
+@@ -11625,36 +12106,45 @@
        fi
        ;;
  
@@ -3798,7 +3797,7 @@
        ;;
  
      uts4*)
-@@ -11675,11 +12165,6 @@
+@@ -11672,11 +12162,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3810,7 +3809,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -11700,13 +12185,14 @@
+@@ -11697,13 +12182,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3825,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -11834,7 +12320,7 @@
+@@ -11831,7 +12317,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3835,8 +3834,9 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
+diff -ur kdesdk-3.5.5.old/aclocal.m4 kdesdk-3.5.5/aclocal.m4
+--- kdesdk-3.5.5.old/aclocal.m4	2006-10-02 20:28:16.000000000 +0200
++++ kdesdk-3.5.5/aclocal.m4	2006-10-10 00:58:00.000000000 +0200
 @@ -522,6 +522,35 @@
    LEX=${am_missing_run}flex
  fi])
@@ -3873,8 +3873,10 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
---- cervisia/cvsservice/Makefile.in
-+++ cervisia/cvsservice/Makefile.in
+Seulement dans kdesdk-3.5.5: autom4te.cache
+diff -ur kdesdk-3.5.5.old/cervisia/cvsservice/Makefile.in kdesdk-3.5.5/cervisia/cvsservice/Makefile.in
+--- kdesdk-3.5.5.old/cervisia/cvsservice/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/cervisia/cvsservice/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -187,6 +187,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -3883,20 +3885,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -235,6 +236,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -266,6 +273,9 @@
+@@ -272,6 +273,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3906,7 +3895,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -306,18 +316,16 @@
+@@ -312,18 +316,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -3926,7 +3915,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,14 +346,18 @@
+@@ -344,14 +346,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -3945,7 +3934,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -412,14 +424,17 @@
+@@ -418,14 +424,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -3963,7 +3952,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -494,7 +509,7 @@
+@@ -500,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -3972,7 +3961,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -532,9 +547,9 @@
+@@ -509,9 +518,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/cvsservice/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/cvsservice/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  cervisia/cvsservice/Makefile
++#>- 	  $(AUTOMAKE) --gnu  cervisia/cvsservice/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -521,9 +530,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/cvsservice/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/cvsservice/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  cervisia/cvsservice/Makefile
++	  $(AUTOMAKE) --gnu  cervisia/cvsservice/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit cervisia/cvsservice/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -538,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3984,8 +3997,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- cervisia/Makefile.in
-+++ cervisia/Makefile.in
+@@ -1086,9 +1095,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/cvsservice/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/cvsservice/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  cervisia/cvsservice/Makefile
++	  $(AUTOMAKE) --gnu  cervisia/cvsservice/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit cervisia/cvsservice/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/cervisia/Makefile.in kdesdk-3.5.5/cervisia/Makefile.in
+--- kdesdk-3.5.5.old/cervisia/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/cervisia/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -232,6 +232,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -3994,20 +4020,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -280,6 +281,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -311,6 +318,9 @@
+@@ -317,6 +318,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4017,7 +4030,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,18 +361,16 @@
+@@ -357,18 +361,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -4037,7 +4050,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,14 +391,18 @@
+@@ -389,14 +391,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -4056,7 +4069,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -457,14 +469,17 @@
+@@ -463,14 +469,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -4074,7 +4087,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +574,7 @@
+@@ -565,7 +574,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -4083,7 +4096,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +612,9 @@
+@@ -574,9 +583,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  cervisia/Makefile
++#>- 	  $(AUTOMAKE) --gnu  cervisia/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -586,9 +595,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  cervisia/Makefile
++	  $(AUTOMAKE) --gnu  cervisia/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit cervisia/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -603,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4095,102 +4132,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1334,18 +1349,18 @@
- cervisia_DEPENDENCIES = libkdeinit_cervisia.la
+@@ -1626,9 +1635,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  cervisia/Makefile
++	  $(AUTOMAKE) --gnu  cervisia/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit cervisia/Makefile.in
  
- #>+ 3
--loglist.moc: $(srcdir)/loglist.h
--	$(MOC) $(srcdir)/loglist.h -o loglist.moc
-+logmessageedit.moc: $(srcdir)/logmessageedit.h
-+	$(MOC) $(srcdir)/logmessageedit.h -o logmessageedit.moc
  
- #>+ 2
--mocs: loglist.moc
-+mocs: logmessageedit.moc
- 
- #>+ 3
--logmessageedit.moc: $(srcdir)/logmessageedit.h
--	$(MOC) $(srcdir)/logmessageedit.h -o logmessageedit.moc
-+loglist.moc: $(srcdir)/loglist.h
-+	$(MOC) $(srcdir)/loglist.h -o loglist.moc
- 
- #>+ 2
--mocs: logmessageedit.moc
-+mocs: loglist.moc
- 
- #>+ 3
- tagdlg.moc: $(srcdir)/tagdlg.h
-@@ -1390,18 +1405,18 @@
- mocs: diffdlg.moc
- 
- #>+ 3
--resolvedlg.moc: $(srcdir)/resolvedlg.h
--	$(MOC) $(srcdir)/resolvedlg.h -o resolvedlg.moc
-+logplainview.moc: $(srcdir)/logplainview.h
-+	$(MOC) $(srcdir)/logplainview.h -o logplainview.moc
- 
- #>+ 2
--mocs: resolvedlg.moc
-+mocs: logplainview.moc
- 
- #>+ 3
--logplainview.moc: $(srcdir)/logplainview.h
--	$(MOC) $(srcdir)/logplainview.h -o logplainview.moc
-+resolvedlg.moc: $(srcdir)/resolvedlg.h
-+	$(MOC) $(srcdir)/resolvedlg.h -o resolvedlg.moc
- 
- #>+ 2
--mocs: logplainview.moc
-+mocs: resolvedlg.moc
- 
- #>+ 3
- mergedlg.moc: $(srcdir)/mergedlg.h
-@@ -1565,10 +1580,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  loglist.moc logmessageedit.moc tagdlg.moc checkoutdlg.moc cvsinitdlg.moc cervisiashell.moc repositorydlg.moc diffdlg.moc resolvedlg.moc logplainview.moc mergedlg.moc tooltip.moc annotateview.moc diffview.moc updatedlg.moc logdlg.moc historydlg.moc progressdlg.moc logtree.moc updateview.moc qttableview.moc patchoptiondlg.moc editwithmenu.moc settingsdlg.moc commitdlg.moc addrepositorydlg.moc protocolview.moc cervisiapart.moc
-+	-rm -f  logmessageedit.moc loglist.moc tagdlg.moc checkoutdlg.moc cvsinitdlg.moc cervisiashell.moc repositorydlg.moc diffdlg.moc logplainview.moc resolvedlg.moc mergedlg.moc tooltip.moc annotateview.moc diffview.moc updatedlg.moc logdlg.moc historydlg.moc progressdlg.moc logtree.moc updateview.moc qttableview.moc patchoptiondlg.moc editwithmenu.moc settingsdlg.moc commitdlg.moc addrepositorydlg.moc protocolview.moc cervisiapart.moc
- 
- #>+ 2
--KDE_DIST=entry_status.h repositories.h cervisia-normalize_cvsroot.pl cervisia.upd cervisiasettings.kcfgc loginfo.h cervisiaui.rc entry_status_change.h tooltip.h annotatectl.h cervisia-change_repos_list.pl repositorydlg.h HACKING watchersdlg.h eventsrc hi16-app-cervisia.png logdlg.h updateview_visitors.h misc.h watchdlg.h patchoptiondlg.h cervisia.1.in updateview_items.h settingsdlg_advanced.ui annotateview.h cvsinitdlg.h updatedlg.h logplainview.h globalignorelist.h resolvedlg_p.h stringmatcher.h cervisiashellui.rc resolvedlg.h checkoutdlg.h logtree.h move_repositories.pl protocolview.h hi32-app-cervisia.png changelogdlg.h annotatedlg.h ignorelistbase.h updateview.h editwithmenu.h diffview.h qttableview.h loglist.h diffdlg.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cervisia.pod tagdlg.h Makefile.in hi48-app-cervisia.png commitdlg.h logmessageedit.h hi22-app-cervisia.png overview.h cvsdir.h mergedlg.h version.h historydlg.h dirignorelist.h Makefile.am entry.h cervisiapart.kcfg progressdlg.h cervisiashell.h change_colors.pl 
-+KDE_DIST=entry_status.h repositories.h cervisia.upd cervisia-normalize_cvsroot.pl cervisiasettings.kcfgc loginfo.h entry_status_change.h annotatectl.h cervisiaui.rc tooltip.h cervisia-change_repos_list.pl repositorydlg.h HACKING watchersdlg.h eventsrc hi16-app-cervisia.png logdlg.h updateview_visitors.h watchdlg.h misc.h patchoptiondlg.h cervisia.1.in updateview_items.h settingsdlg_advanced.ui annotateview.h cvsinitdlg.h updatedlg.h logplainview.h globalignorelist.h resolvedlg_p.h stringmatcher.h cervisiashellui.rc checkoutdlg.h resolvedlg.h logtree.h move_repositories.pl protocolview.h hi32-app-cervisia.png changelogdlg.h annotatedlg.h ignorelistbase.h updateview.h diffview.h qttableview.h editwithmenu.h diffdlg.h loglist.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cervisia.pod tagdlg.h Makefile.in hi48-app-cervisia.png commitdlg.h logmessageedit.h hi22-app-cervisia.png version.h mergedlg.h cvsdir.h overview.h historydlg.h dirignorelist.h Makefile.am entry.h progressdlg.h cervisiashell.h cervisiapart.kcfg change_colors.pl 
- 
- #>+ 5
- clean-idl:
-@@ -1597,18 +1612,18 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-cervisia.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/cervisia.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-cervisia.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/cervisia.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-cervisia.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/cervisia.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-cervisia.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/cervisia.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-cervisia.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/cervisia.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/cervisia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/cervisia.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/cervisia.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/cervisia.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/cervisia.png
- 
- #>+ 15
- force-reedit:
-@@ -1673,7 +1688,7 @@
- 	rm -f cervisia_la.all_cpp.final cervisia_la.all_cpp.files
- 
- #>+ 11
--libcervisia_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/annotatedlg.cpp $(srcdir)/diffdlg.cpp $(srcdir)/patchoptiondlg.cpp $(srcdir)/logdlg.cpp $(srcdir)/progressdlg.cpp $(srcdir)/resolvedlg.cpp $(srcdir)/resolvedlg_p.cpp $(srcdir)/annotateview.cpp $(srcdir)/diffview.cpp $(srcdir)/loglist.cpp $(srcdir)/logplainview.cpp $(srcdir)/logtree.cpp $(srcdir)/annotatectl.cpp $(srcdir)/loginfo.cpp $(srcdir)/misc.cpp $(srcdir)/qttableview.cpp $(srcdir)/tooltip.cpp $(srcdir)/settingsdlg.cpp progressdlg_skel.cpp settingsdlg_advanced.cpp cervisiasettings.cpp  loglist.moc diffdlg.moc logplainview.moc resolvedlg.moc tooltip.moc annotateview.moc diffview.moc logdlg.moc settingsdlg_advanced.moc progressdlg.moc logtree.moc qttableview.moc patchoptiondlg.moc settingsdlg.moc
-+libcervisia_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/annotatedlg.cpp $(srcdir)/diffdlg.cpp $(srcdir)/patchoptiondlg.cpp $(srcdir)/logdlg.cpp $(srcdir)/progressdlg.cpp $(srcdir)/resolvedlg.cpp $(srcdir)/resolvedlg_p.cpp $(srcdir)/annotateview.cpp $(srcdir)/diffview.cpp $(srcdir)/loglist.cpp $(srcdir)/logplainview.cpp $(srcdir)/logtree.cpp $(srcdir)/annotatectl.cpp $(srcdir)/loginfo.cpp $(srcdir)/misc.cpp $(srcdir)/qttableview.cpp $(srcdir)/tooltip.cpp $(srcdir)/settingsdlg.cpp progressdlg_skel.cpp settingsdlg_advanced.cpp cervisiasettings.cpp  loglist.moc diffdlg.moc resolvedlg.moc logplainview.moc tooltip.moc annotateview.moc diffview.moc logdlg.moc settingsdlg_advanced.moc progressdlg.moc logtree.moc qttableview.moc patchoptiondlg.moc settingsdlg.moc
- 	@echo 'creating libcervisia_la.all_cpp.cpp ...'; \
- 	rm -f libcervisia_la.all_cpp.files libcervisia_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libcervisia_la.all_cpp.final; \
---- cervisia/pics/Makefile.in
-+++ cervisia/pics/Makefile.in
+diff -ur kdesdk-3.5.5.old/cervisia/pics/Makefile.in kdesdk-3.5.5/cervisia/pics/Makefile.in
+--- kdesdk-3.5.5.old/cervisia/pics/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/cervisia/pics/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -4199,20 +4155,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4222,7 +4165,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -4242,7 +4185,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -4261,7 +4204,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -4279,7 +4222,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -356,7 +371,7 @@
+@@ -362,7 +371,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -4288,7 +4231,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -394,9 +409,9 @@
+@@ -371,9 +380,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/pics/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/pics/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  cervisia/pics/Makefile
++#>- 	  $(AUTOMAKE) --gnu  cervisia/pics/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -383,9 +392,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  cervisia/pics/Makefile
++	  $(AUTOMAKE) --gnu  cervisia/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit cervisia/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -400,9 +409,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4300,136 +4267,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -539,80 +554,80 @@
- .NOEXPORT:
+@@ -630,9 +639,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  cervisia/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cervisia/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  cervisia/pics/Makefile
++	  $(AUTOMAKE) --gnu  cervisia/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit cervisia/pics/Makefile.in
  
- #>+ 2
--KDE_DIST=cr22-action-vcs_add.png crsc-action-vcs_diff.svgz crsc-action-vcs_commit.svgz cr32-action-vcs_add.png cr22-action-vcs_status.png cr48-action-vcs_update.png cr32-action-vcs_diff.png cr16-action-vcs_add.png crsc-action-vcs_update.svgz cr22-action-vcs_remove.png cr16-action-vcs_diff.png cr48-action-vcs_remove.png cr48-action-vcs_add.png crsc-action-vcs_status.svgz cr22-action-vcs_commit.png cr16-action-vcs_status.png crsc-action-vcs_remove.svgz cr32-action-vcs_commit.png cr22-action-vcs_diff.png cr48-action-vcs_status.png cr22-action-vcs_update.png cr16-action-vcs_update.png cr32-action-vcs_status.png Makefile.in cr32-action-vcs_remove.png crsc-action-vcs_add.svgz cr16-action-vcs_remove.png cr48-action-vcs_diff.png cr32-action-vcs_update.png cr48-action-vcs_commit.png Makefile.am cr16-action-vcs_commit.png 
-+KDE_DIST=cr22-action-vcs_add.png crsc-action-vcs_diff.svgz crsc-action-vcs_commit.svgz cr32-action-vcs_add.png cr22-action-vcs_status.png cr48-action-vcs_update.png cr32-action-vcs_diff.png cr16-action-vcs_add.png crsc-action-vcs_update.svgz cr22-action-vcs_remove.png cr16-action-vcs_diff.png cr48-action-vcs_remove.png cr48-action-vcs_add.png crsc-action-vcs_status.svgz cr22-action-vcs_commit.png cr16-action-vcs_status.png crsc-action-vcs_remove.svgz cr32-action-vcs_commit.png cr22-action-vcs_diff.png cr48-action-vcs_status.png cr16-action-vcs_update.png cr22-action-vcs_update.png cr32-action-vcs_status.png Makefile.in cr32-action-vcs_remove.png crsc-action-vcs_add.svgz cr16-action-vcs_remove.png cr48-action-vcs_diff.png cr32-action-vcs_update.png cr48-action-vcs_commit.png Makefile.am cr16-action-vcs_commit.png 
  
- #>+ 2
- docs-am:
- 
- #>+ 69
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
--	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_commit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_commit.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_add.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_remove.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_diff.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_diff.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_diff.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_diff.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_update.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_update.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_status.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
- 	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_remove.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_remove.svgz
--	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_update.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_update.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_commit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_commit.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_update.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_update.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_commit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_commit.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_status.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_commit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_commit.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_remove.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_diff.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_diff.svgz
--	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_remove.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_diff.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_update.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_update.svgz
--	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_status.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_status.svgz
--	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_commit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_commit.svgz
--	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_add.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_add.svgz
--	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_diff.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_update.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_update.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_diff.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_remove.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_add.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_commit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_commit.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_remove.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_update.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_update.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_add.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_update.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_update.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_diff.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_commit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_commit.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_commit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_commit.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_commit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_commit.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_diff.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-vcs_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_status.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_status.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_status.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-vcs_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_add.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-vcs_add.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_add.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-vcs_diff.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_diff.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_commit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_diff.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_diff.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_diff.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_update.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_status.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_remove.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_update.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_commit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_update.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_commit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_status.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_commit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_diff.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_diff.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_update.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_status.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_commit.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_add.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_diff.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_update.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_diff.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_remove.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_commit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_remove.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_update.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_update.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_diff.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_commit.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_commit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_commit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/vcs_diff.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/vcs_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_status.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/vcs_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/vcs_add.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/vcs_diff.png
- 
- #>+ 15
- force-reedit:
---- config.h.in
-+++ config.h.in
+diff -ur kdesdk-3.5.5.old/config.h.in kdesdk-3.5.5/config.h.in
+--- kdesdk-3.5.5.old/config.h.in	2006-10-02 20:28:23.000000000 +0200
++++ kdesdk-3.5.5/config.h.in	2006-10-10 00:58:07.000000000 +0200
 @@ -123,22 +123,22 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
@@ -4459,18 +4311,10 @@
  #undef SIZEOF_UNSIGNED_LONG
  
  /* Define to 1 if you have the ANSI C header files. */
-@@ -153,6 +153,9 @@
- /* Defined if compiling without arts */
- #undef WITHOUT_ARTS
- 
-+/* Defines the executable of xmllint */
-+#undef XMLLINT
-+
- /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-    `char[]'. */
- #undef YYTEXT_POINTER
---- configure
-+++ configure
+Seulement dans kdesdk-3.5.5: config.h.in~
+diff -ur kdesdk-3.5.5.old/configure kdesdk-3.5.5/configure
+--- kdesdk-3.5.5.old/configure	2006-10-02 20:29:39.000000000 +0200
++++ kdesdk-3.5.5/configure	2006-10-10 00:58:55.000000000 +0200
 @@ -1,8 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -5215,7 +5059,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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LEX LEXLIB LEX_OUTPUT_ROOT DBIV_INCLUDES DBIV_LDFLAGS DBIV_NAME LIB_DBIV include_DBSEARCHENGINE_TRUE include_DBSEARCHENGINE_FALSE include_kcalresource_TRUE include_kcalresource_FALSE KCACHEGRIND_VERSION SVNCONFIG SVN_INCLUDE SVN_LIB SVN_CPPFLAGS SVNLD include_kioslave_svn_TRUE include_kioslave_svn_FALSE KMTRACE_LIBS TOPSUBDIRS cervisia_SUBDIR_included_TRUE cervisia_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kapptemplate_SUBDIR_included_TRUE kapptemplate_SUBDIR_included_FALSE kbabel_SUBDIR_included_TRUE kbabel_SUBDIR_included_FALSE kbugbuster_SUBDIR_included_TRUE kbugbuster_SUBDIR_included_FALSE kcachegrind_SUBDIR_included_TRUE kcachegrind_SUBDIR_included_FALSE kdeaccounts_plugin_SUBDIR_included_TRUE kdeaccounts_plugin_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kmtrace_SUBDIR_included_TRUE kmtrace_SUBDIR_included_FALSE kompare_SUBDIR_included_TRUE kompare_SUBDIR_included_FALSE kprofilemethod_SUBDIR_included_TRUE kprofilemethod_SUBDIR_included_FALSE kspy_SUBDIR_included_TRUE kspy_SUBDIR_included_FALSE kstartperf_SUBDIR_included_TRUE kstartperf_SUBDIR_included_FALSE kuiviewer_SUBDIR_included_TRUE kuiviewer_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE poxml_SUBDIR_included_TRUE poxml_SUBDIR_included_FALSE scheck_SUBDIR_included_TRUE scheck_SUBDIR_included_FALSE scripts_SUBDIR_included_TRUE scripts_SUBDIR_included_FALSE umbrello_SUBDIR_included_TRUE umbrello_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LEX LEXLIB LEX_OUTPUT_ROOT DBIV_INCLUDES DBIV_LDFLAGS DBIV_NAME LIB_DBIV include_DBSEARCHENGINE_TRUE include_DBSEARCHENGINE_FALSE include_kcalresource_TRUE include_kcalresource_FALSE KCACHEGRIND_VERSION SVNCONFIG SVN_INCLUDE SVN_LIB SVN_CPPFLAGS SVNLD include_kioslave_svn_TRUE include_kioslave_svn_FALSE KMTRACE_LIBS LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH TOPSUBDIRS cervisia_SUBDIR_included_TRUE cervisia_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kapptemplate_SUBDIR_included_TRUE kapptemplate_SUBDIR_included_FALSE kbabel_SUBDIR_included_TRUE kbabel_SUBDIR_included_FALSE kbugbuster_SUBDIR_included_TRUE kbugbuster_SUBDIR_included_FALSE kcachegrind_SUBDIR_included_TRUE kcachegrind_SUBDIR_included_FALSE kdeaccounts_plugin_SUBDIR_included_TRUE kdeaccounts_plugin_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kmtrace_SUBDIR_included_TRUE kmtrace_SUBDIR_included_FALSE kompare_SUBDIR_included_TRUE kompare_SUBDIR_included_FALSE kprofilemethod_SUBDIR_included_TRUE kprofilemethod_SUBDIR_included_FALSE kspy_SUBDIR_included_TRUE kspy_SUBDIR_included_FALSE kstartperf_SUBDIR_included_TRUE kstartperf_SUBDIR_included_FALSE kuiviewer_SUBDIR_included_TRUE kuiviewer_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE poxml_SUBDIR_included_TRUE poxml_SUBDIR_included_FALSE scheck_SUBDIR_included_TRUE scheck_SUBDIR_included_FALSE scripts_SUBDIR_included_TRUE scripts_SUBDIR_included_FALSE umbrello_SUBDIR_included_TRUE umbrello_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
 +ac_subst_vars='SHELL
 +PATH_SEPARATOR
 +PACKAGE_NAME
@@ -7061,9 +6905,9 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2277,16 +2992,16 @@
+@@ -2276,16 +2991,16 @@
+   fi
    kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-   kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
  
 -  echo "$as_me:$LINENO: checking where to install" >&5
 -echo $ECHO_N "checking where to install... $ECHO_C" >&6
@@ -7084,7 +6928,7 @@
    fi
  
    # And delete superfluous '/' to make compares easier
-@@ -2299,13 +3014,13 @@
+@@ -2298,13 +3013,13 @@
  
  
  
@@ -7102,7 +6946,7 @@
  
  
    val=
-@@ -2322,11 +3037,11 @@
+@@ -2321,11 +3036,11 @@
  
  
  
@@ -7116,7 +6960,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2336,8 +3051,8 @@
+@@ -2335,8 +3050,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -7127,7 +6971,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2364,15 +3079,15 @@
+@@ -2363,15 +3078,15 @@
  fi
  
  
@@ -7148,7 +6992,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2392,10 +3107,9 @@
+@@ -2391,10 +3106,9 @@
  
  
  
@@ -7161,7 +7005,7 @@
      case $enableval in
        yes)
          kde_use_debug_code="yes"
-@@ -2415,18 +3129,18 @@
+@@ -2414,18 +3128,18 @@
    kde_use_debug_code="no"
        kde_use_debug_define=no
  
@@ -7187,7 +7031,7 @@
      if test $enableval = "no"; then
           kde_use_strict_options="no"
         else
-@@ -2435,12 +3149,12 @@
+@@ -2434,12 +3148,12 @@
  
  else
    kde_use_strict_options="no"
@@ -7204,7 +7048,7 @@
      if test $enableval = "no"; then
           kde_use_warnings="no"
         else
-@@ -2449,20 +3163,21 @@
+@@ -2448,20 +3162,21 @@
  
  else
    kde_use_warnings="yes"
@@ -7231,7 +7075,7 @@
  
      CFLAGS=" $CFLAGS"
  
-@@ -2474,8 +3189,8 @@
+@@ -2473,8 +3188,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7242,7 +7086,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2488,32 +3203,34 @@
+@@ -2487,32 +3202,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7284,7 +7128,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2526,36 +3243,51 @@
+@@ -2525,36 +3242,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7346,7 +7190,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2568,74 +3300,34 @@
+@@ -2567,74 +3299,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7430,7 +7274,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2649,7 +3341,7 @@
+@@ -2648,7 +3340,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7439,7 +7283,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2660,6 +3352,7 @@
+@@ -2659,6 +3351,7 @@
    fi
  done
  done
@@ -7447,7 +7291,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2677,22 +3370,23 @@
+@@ -2676,22 +3369,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7478,7 +7322,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2705,36 +3399,38 @@
+@@ -2704,36 +3398,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7525,7 +7369,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2747,29 +3443,45 @@
+@@ -2746,29 +3442,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7577,7 +7421,7 @@
  fi
  
  fi
-@@ -2782,21 +3494,35 @@
+@@ -2781,21 +3493,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -7621,7 +7465,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2821,47 +3547,77 @@
+@@ -2820,47 +3546,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -7721,7 +7565,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2873,19 +3629,21 @@
+@@ -2872,19 +3628,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -7750,7 +7594,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2904,22 +3662,27 @@
+@@ -2903,22 +3661,27 @@
      fi
    fi
  fi
@@ -7790,7 +7634,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2930,9 +3693,8 @@
+@@ -2929,9 +3692,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7801,7 +7645,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -2946,14 +3708,14 @@
+@@ -2945,14 +3707,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -7820,7 +7664,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2973,14 +3735,20 @@
+@@ -2972,14 +3734,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -7845,7 +7689,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2998,12 +3766,12 @@
+@@ -2997,12 +3765,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -7862,7 +7706,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3026,24 +3794,36 @@
+@@ -3025,24 +3793,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7907,7 +7751,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3052,24 +3832,28 @@
+@@ -3051,24 +3831,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7944,7 +7788,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3085,24 +3869,147 @@
+@@ -3084,24 +3868,147 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8100,7 +7944,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3111,12 +4018,20 @@
+@@ -3110,12 +4017,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8125,7 +7969,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3132,12 +4047,12 @@
+@@ -3131,12 +4046,12 @@
      CFLAGS=
    fi
  fi
@@ -8142,7 +7986,7 @@
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3171,12 +4086,17 @@
+@@ -3170,12 +4085,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -8162,7 +8006,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -3191,205 +4111,74 @@
+@@ -3190,205 +4110,74 @@
    return 0;
  }
  _ACEOF
@@ -8407,7 +8251,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3398,8 +4187,8 @@
+@@ -3397,8 +4186,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -8418,7 +8262,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3488,8 +4277,8 @@
+@@ -3487,8 +4276,8 @@
  fi
  
  fi
@@ -8429,7 +8273,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3511,8 +4300,8 @@
+@@ -3510,8 +4299,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8440,7 +8284,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3546,8 +4335,13 @@
+@@ -3545,8 +4334,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -8456,7 +8300,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3572,9 +4366,10 @@
+@@ -3571,9 +4365,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8468,7 +8312,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3584,8 +4379,13 @@
+@@ -3583,8 +4378,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -8484,7 +8328,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3612,6 +4412,7 @@
+@@ -3611,6 +4411,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8492,7 +8336,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3629,8 +4430,8 @@
+@@ -3628,8 +4429,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -8503,7 +8347,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3653,8 +4454,13 @@
+@@ -3652,8 +4453,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -8519,7 +8363,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3679,9 +4485,10 @@
+@@ -3678,9 +4484,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8531,7 +8375,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3691,8 +4498,13 @@
+@@ -3690,8 +4497,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -8547,7 +8391,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3719,6 +4531,7 @@
+@@ -3718,6 +4530,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8555,7 +8399,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3769,18 +4582,22 @@
+@@ -3768,18 +4581,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -8583,7 +8427,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3793,36 +4610,38 @@
+@@ -3792,36 +4609,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8630,7 +8474,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3835,55 +4654,85 @@
+@@ -3834,55 +4653,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8734,7 +8578,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3906,24 +4755,36 @@
+@@ -3905,24 +4754,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8779,7 +8623,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3932,24 +4793,28 @@
+@@ -3931,24 +4792,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8816,7 +8660,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3965,24 +4830,36 @@
+@@ -3964,24 +4829,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8861,7 +8705,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3991,70 +4868,53 @@
+@@ -3990,70 +4867,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8956,7 +8800,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4063,61 +4923,91 @@
+@@ -4062,61 +4922,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9070,7 +8914,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4126,8 +5016,8 @@
+@@ -4125,8 +5015,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -9081,7 +8925,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4216,8 +5106,8 @@
+@@ -4215,8 +5105,8 @@
  fi
  
  fi
@@ -9092,7 +8936,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4235,8 +5125,8 @@
+@@ -4234,8 +5124,8 @@
  
  
  
@@ -9103,7 +8947,7 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4261,24 +5151,36 @@
+@@ -4260,24 +5150,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9148,7 +8992,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4287,13 +5189,14 @@
+@@ -4286,13 +5188,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9167,7 +9011,7 @@
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4335,17 +5238,16 @@
+@@ -4334,17 +5237,16 @@
          fi
        fi
  
@@ -9189,7 +9033,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4373,24 +5275,36 @@
+@@ -4372,24 +5274,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9234,7 +9078,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4399,8 +5313,10 @@
+@@ -4398,8 +5312,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9246,7 +9090,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4413,29 +5329,28 @@
+@@ -4412,29 +5328,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9284,7 +9128,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4462,24 +5377,36 @@
+@@ -4461,24 +5376,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9329,7 +9173,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4488,8 +5415,10 @@
+@@ -4487,8 +5414,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9341,7 +9185,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4502,13 +5431,13 @@
+@@ -4501,13 +5430,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9359,7 +9203,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4529,16 +5458,15 @@
+@@ -4528,16 +5457,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -9380,7 +9224,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4565,24 +5493,36 @@
+@@ -4564,24 +5492,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9425,7 +9269,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4591,8 +5531,10 @@
+@@ -4590,8 +5530,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9437,7 +9281,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4605,16 +5547,16 @@
+@@ -4604,16 +5546,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9458,7 +9302,7 @@
   :
  
  fi
-@@ -4629,16 +5571,15 @@
+@@ -4628,16 +5570,15 @@
              CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
              CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
  
@@ -9479,7 +9323,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4665,24 +5606,36 @@
+@@ -4664,24 +5605,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9524,7 +9368,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4691,8 +5644,10 @@
+@@ -4690,8 +5643,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9536,7 +9380,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4705,27 +5660,26 @@
+@@ -4704,27 +5659,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9571,7 +9415,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4750,24 +5704,36 @@
+@@ -4749,24 +5703,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9616,7 +9460,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4776,8 +5742,10 @@
+@@ -4775,8 +5741,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9628,7 +9472,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
    ac_ext=c
-@@ -4790,13 +5758,13 @@
+@@ -4789,13 +5757,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9646,7 +9490,7 @@
   :
  
  fi
-@@ -4804,16 +5772,15 @@
+@@ -4803,16 +5771,15 @@
            ;;
          esac
  
@@ -9667,7 +9511,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4840,24 +5807,36 @@
+@@ -4839,24 +5806,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9712,7 +9556,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4866,8 +5845,10 @@
+@@ -4865,8 +5844,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9724,7 +9568,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4880,28 +5861,27 @@
+@@ -4879,28 +5860,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9761,7 +9605,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4928,24 +5908,36 @@
+@@ -4927,24 +5907,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9806,7 +9650,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4954,8 +5946,10 @@
+@@ -4953,8 +5945,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9818,7 +9662,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4968,28 +5962,27 @@
+@@ -4967,28 +5961,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9855,7 +9699,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5016,24 +6009,36 @@
+@@ -5015,24 +6008,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9900,7 +9744,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5042,8 +6047,10 @@
+@@ -5041,8 +6046,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9912,7 +9756,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5056,13 +6063,13 @@
+@@ -5055,13 +6062,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9930,7 +9774,7 @@
   :
  
  fi
-@@ -5074,13 +6081,13 @@
+@@ -5073,13 +6080,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -9948,7 +9792,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5088,16 +6095,15 @@
+@@ -5087,16 +6094,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -9969,7 +9813,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5124,24 +6130,36 @@
+@@ -5123,24 +6129,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10014,7 +9858,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5150,8 +6168,10 @@
+@@ -5149,8 +6167,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10026,7 +9870,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5164,13 +6184,13 @@
+@@ -5163,13 +6183,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10044,7 +9888,7 @@
   :
  
  fi
-@@ -5182,16 +6202,15 @@
+@@ -5181,16 +6201,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -10065,7 +9909,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5218,24 +6237,36 @@
+@@ -5217,24 +6236,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10110,7 +9954,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5244,8 +6275,10 @@
+@@ -5243,8 +6274,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10122,7 +9966,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5258,28 +6291,27 @@
+@@ -5257,28 +6290,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10159,7 +10003,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5306,24 +6338,36 @@
+@@ -5305,24 +6337,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10204,7 +10048,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5332,8 +6376,10 @@
+@@ -5331,8 +6375,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10216,7 +10060,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5346,28 +6392,27 @@
+@@ -5345,28 +6391,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10253,7 +10097,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5394,24 +6439,36 @@
+@@ -5393,24 +6438,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10298,7 +10142,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5420,8 +6477,10 @@
+@@ -5419,8 +6476,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10310,7 +10154,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5434,28 +6493,27 @@
+@@ -5433,28 +6492,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10347,7 +10191,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5482,24 +6540,36 @@
+@@ -5481,24 +6539,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10392,7 +10236,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5508,8 +6578,10 @@
+@@ -5507,8 +6577,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10404,7 +10248,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5522,13 +6594,13 @@
+@@ -5521,13 +6593,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10422,7 +10266,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5536,37 +6608,37 @@
+@@ -5535,37 +6607,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -10474,7 +10318,7 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5598,24 +6670,36 @@
+@@ -5597,24 +6669,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10519,7 +10363,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5624,18 +6708,19 @@
+@@ -5623,18 +6707,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10543,7 +10387,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5655,16 +6740,15 @@
+@@ -5654,16 +6739,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -10564,7 +10408,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5691,24 +6775,36 @@
+@@ -5690,24 +6774,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10609,7 +10453,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5717,8 +6813,10 @@
+@@ -5716,8 +6812,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10621,7 +10465,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5731,29 +6829,28 @@
+@@ -5730,29 +6828,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10659,7 +10503,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5780,24 +6877,36 @@
+@@ -5779,24 +6876,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10704,7 +10548,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5806,8 +6915,10 @@
+@@ -5805,8 +6914,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10716,7 +10560,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5820,28 +6931,27 @@
+@@ -5819,28 +6930,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10753,7 +10597,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5868,24 +6978,36 @@
+@@ -5867,24 +6977,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10798,7 +10642,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5894,8 +7016,10 @@
+@@ -5893,8 +7015,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10810,7 +10654,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5908,28 +7032,27 @@
+@@ -5907,28 +7031,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10847,7 +10691,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5956,24 +7079,36 @@
+@@ -5955,24 +7078,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10892,7 +10736,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5982,8 +7117,10 @@
+@@ -5981,8 +7116,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10904,7 +10748,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5996,28 +7133,27 @@
+@@ -5995,28 +7132,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10941,7 +10785,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6044,24 +7180,36 @@
+@@ -6043,24 +7179,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10986,7 +10830,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6070,8 +7218,10 @@
+@@ -6069,8 +7217,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10998,7 +10842,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6084,28 +7234,27 @@
+@@ -6083,28 +7233,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11035,7 +10879,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6132,24 +7281,36 @@
+@@ -6131,24 +7280,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11080,7 +10924,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6158,8 +7319,10 @@
+@@ -6157,8 +7318,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11092,7 +10936,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6172,13 +7335,13 @@
+@@ -6171,13 +7334,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11110,7 +10954,7 @@
   :
  
  fi
-@@ -6285,13 +7448,13 @@
+@@ -6284,13 +7447,13 @@
  fi
  
  
@@ -11127,7 +10971,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6321,8 +7484,13 @@
+@@ -6320,8 +7483,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -11143,7 +10987,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6347,9 +7515,10 @@
+@@ -6346,9 +7514,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -11155,7 +10999,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6359,8 +7528,13 @@
+@@ -6358,8 +7527,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -11171,7 +11015,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6387,6 +7561,7 @@
+@@ -6386,6 +7560,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -11179,7 +11023,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6404,8 +7579,8 @@
+@@ -6403,8 +7578,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -11190,7 +11034,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6428,8 +7603,13 @@
+@@ -6427,8 +7602,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -11206,7 +11050,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6454,9 +7634,10 @@
+@@ -6453,9 +7633,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -11218,7 +11062,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6466,8 +7647,13 @@
+@@ -6465,8 +7646,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -11234,7 +11078,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6494,6 +7680,7 @@
+@@ -6493,6 +7679,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -11242,7 +11086,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6520,16 +7707,15 @@
+@@ -6519,16 +7706,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -11263,7 +11107,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6556,24 +7742,36 @@
+@@ -6555,24 +7741,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11308,7 +11152,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6582,8 +7780,10 @@
+@@ -6581,8 +7779,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11320,7 +11164,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6596,22 +7796,21 @@
+@@ -6595,22 +7795,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11349,7 +11193,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6627,36 +7826,36 @@
+@@ -6626,36 +7825,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -11396,7 +11240,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6683,24 +7882,36 @@
+@@ -6682,24 +7881,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11441,7 +11285,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6709,8 +7920,10 @@
+@@ -6708,8 +7919,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11453,7 +11297,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6723,29 +7936,28 @@
+@@ -6722,29 +7935,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11491,7 +11335,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6772,24 +7984,36 @@
+@@ -6771,24 +7983,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11536,7 +11380,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6798,8 +8022,10 @@
+@@ -6797,8 +8021,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11548,7 +11392,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6812,13 +8038,13 @@
+@@ -6811,13 +8037,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11566,7 +11410,7 @@
   :
  
  fi
-@@ -6828,13 +8054,13 @@
+@@ -6827,13 +8053,13 @@
  
  
  
@@ -11584,7 +11428,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6847,13 +8073,13 @@
+@@ -6846,13 +8072,13 @@
  
  
  
@@ -11602,7 +11446,7 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6864,272 +8090,93 @@
+@@ -6863,276 +8089,97 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -11763,16 +11607,15 @@
 -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'
- 
-+    kdelibsuff="$kde_libs_suffix"
-+    if test -z "$kdelibsuff"; then
-+       kdelibsuff="no"
-+    fi
++
 +    # Check whether --enable-libsuffix was given.
 +if test "${enable_libsuffix+set}" = set; then
 +  enableval=$enable_libsuffix; kdelibsuff=$enableval
++else
++  kdelibsuff="auto"
 +fi
  
+ 
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -11781,7 +11624,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    if test "$kdelibsuff" = "auto"; then
+ 
 -int
 -main ()
 -{
@@ -11929,19 +11773,26 @@
 -
 -
 -
--    kdelibsuff="$kde_libs_suffix"
--    if test -z "$kdelibsuff"; then
--       kdelibsuff="no"
--    fi
 -    # Check whether --enable-libsuffix or --disable-libsuffix was given.
 -if test "${enable_libsuffix+set}" = set; then
 -  enableval="$enable_libsuffix"
 -  kdelibsuff=$enableval
+-else
+-  kdelibsuff="auto"
 -fi;
- 
-     if test "$kdelibsuff" = "auto"; then
- 
-@@ -7150,8 +8197,8 @@
+-
+-    if test "$kdelibsuff" = "auto"; then
+-
+-cat > conftest.c << EOF
+-#include <stdio.h>
+-int main() {
++cat > conftest.c << EOF
++#include <stdio.h>
++int main() {
+  return 0;
+ }
+ EOF
+@@ -7147,8 +8194,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -11952,7 +11803,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7167,14 +8214,13 @@
+@@ -7164,14 +8211,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -11971,7 +11822,7 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7193,10 +8239,11 @@
+@@ -7190,10 +8236,11 @@
      esac
  else
    enable_fast_install=yes
@@ -11986,7 +11837,7 @@
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7220,7 +8267,7 @@
+@@ -7217,7 +8264,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -11995,7 +11846,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7249,37 +8296,184 @@
+@@ -7246,37 +8293,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -12058,7 +11909,10 @@
 +    $ac_path_GREP_found && break 3
 +  done
 +done
-+
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
 +done
 +IFS=$as_save_IFS
 +
@@ -12081,11 +11935,8 @@
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
 +
++
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
@@ -12158,25 +12009,25 @@
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
- 
++fi
++
 +else
 +  ac_cv_path_EGREP=$EGREP
 +fi
 +
 +
 +   fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
  
  
+ 
 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+
 +# Check whether --with-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
@@ -12197,7 +12048,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -7308,11 +8502,11 @@
+@@ -7305,11 +8499,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -12213,7 +12064,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7325,7 +8519,7 @@
+@@ -7322,7 +8516,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -12222,7 +12073,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7345,21 +8539,21 @@
+@@ -7342,21 +8536,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -12251,7 +12102,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7369,29 +8563,38 @@
+@@ -7366,29 +8560,38 @@
    ;;
  esac
  fi
@@ -12298,7 +12149,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7399,56 +8602,63 @@
+@@ -7396,56 +8599,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -12396,7 +12247,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7475,44 +8685,36 @@
+@@ -7472,44 +8682,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -12451,7 +12302,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7528,7 +8730,7 @@
+@@ -7525,7 +8727,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -12460,7 +12311,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7544,43 +8746,27 @@
+@@ -7541,43 +8743,27 @@
    esac
    ;;
  
@@ -12517,7 +12368,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7599,32 +8785,22 @@
+@@ -7596,32 +8782,22 @@
    ;;
  
  openbsd*)
@@ -12553,7 +12404,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7645,17 +8821,20 @@
+@@ -7642,17 +8818,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -12577,7 +12428,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7664,14 +8843,17 @@
+@@ -7661,14 +8840,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -12598,16 +12449,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7698,7 +8880,7 @@
+@@ -7695,7 +8877,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7701 "configure"' > conftest.$ac_ext
-+  echo '#line 8883 "configure"' > conftest.$ac_ext
+-  echo '#line 7698 "configure"' > conftest.$ac_ext
++  echo '#line 8880 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7741,14 +8923,13 @@
+@@ -7738,14 +8920,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -12624,7 +12475,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7760,7 +8941,6 @@
+@@ -7757,7 +8938,6 @@
        esac
        ;;
      *64-bit*)
@@ -12632,7 +12483,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7785,8 +8965,8 @@
+@@ -7782,8 +8962,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -12643,7 +12494,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7812,24 +8992,36 @@
+@@ -7809,24 +8989,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12688,7 +12539,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7838,9 +9030,10 @@
+@@ -7835,9 +9027,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12701,7 +12552,7 @@
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -7849,25 +9042,45 @@
+@@ -7846,22 +9039,42 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -12718,14 +12569,6 @@
 -esac
 -
 -need_locks="$enable_libtool_lock"
--
--
--
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
--if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
 +sparc*-*solaris*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
@@ -12750,18 +12593,17 @@
 +esac
 +
 +need_locks="$enable_libtool_lock"
-+
-+
-+
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7888,24 +9101,36 @@
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7885,24 +9098,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12806,7 +12648,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7914,9 +9139,10 @@
+@@ -7911,9 +9136,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12819,7 +12661,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7972,6 +9198,7 @@
+@@ -7969,6 +9195,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -12827,7 +12669,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7991,18 +9218,27 @@
+@@ -7988,18 +9215,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -12861,7 +12703,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8015,12 +9251,14 @@
+@@ -8012,12 +9248,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -12879,7 +12721,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8043,9 +9281,9 @@
+@@ -8040,9 +9278,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12892,7 +12734,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8059,24 +9297,36 @@
+@@ -8056,24 +9294,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12937,7 +12779,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8085,12 +9335,14 @@
+@@ -8082,12 +9332,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12956,7 +12798,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8105,18 +9357,19 @@
+@@ -8102,18 +9354,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12984,7 +12826,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8127,24 +9380,36 @@
+@@ -8124,24 +9377,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13029,7 +12871,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8153,15 +9418,16 @@
+@@ -8150,15 +9415,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13052,7 +12894,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8170,8 +9436,13 @@
+@@ -8167,8 +9433,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -13068,7 +12910,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8195,9 +9466,10 @@
+@@ -8192,9 +9463,10 @@
  
    ac_header_preproc=no
  fi
@@ -13081,7 +12923,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8221,25 +9493,19 @@
+@@ -8218,25 +9490,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -13114,7 +12956,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8251,345 +9517,711 @@
+@@ -8248,364 +9514,746 @@
  
  done
  
@@ -13227,7 +13069,7 @@
 -
 -
 -# Provide some information about the compiler.
--echo "$as_me:8346:" \
+-echo "$as_me:8343:" \
 -     "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
@@ -13415,7 +13257,14 @@
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
--fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
 -if test "$ac_test_FFLAGS" = set; then
@@ -13426,15 +13275,7 @@
 -  else
 -    FFLAGS="-g"
 -  fi
-+rm -f conftest.err conftest.$ac_ext
 +
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+  break
-+fi
-+
 +    done
 +    ac_cv_prog_CXXCPP=$CXXCPP
 +
@@ -13768,6 +13609,14 @@
 -case $host_os in
 -aix*)
 -  symcode='[BCDT]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[ABCDGISTW]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[ABCDEGRST]'
+-  fi
 +# Provide some information about the compiler.
 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
@@ -14103,10 +13952,14 @@
 +case $host_os in
 +aix*)
 +  symcode='[BCDT]'
-   ;;
- cygwin* | mingw* | pw32*)
-   symcode='[ABCDGISTW]'
-@@ -8601,14 +10233,30 @@
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDEGRST]'
++  fi
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -14139,7 +13992,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8626,14 +10274,17 @@
+@@ -8623,14 +10271,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -14159,7 +14012,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8751,15 +10402,15 @@
+@@ -8748,15 +10399,15 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -14181,7 +14034,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8773,8 +10424,8 @@
+@@ -8770,8 +10421,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -14192,7 +14045,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8795,7 +10446,7 @@
+@@ -8792,7 +10443,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -14201,7 +14054,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8815,7 +10466,7 @@
+@@ -8812,7 +10463,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -14210,7 +14063,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8825,8 +10476,8 @@
+@@ -8822,8 +10473,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -14221,7 +14074,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8839,32 +10490,34 @@
+@@ -8836,32 +10487,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14263,7 +14116,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8877,27 +10530,41 @@
+@@ -8874,27 +10527,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14312,7 +14165,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8905,8 +10572,8 @@
+@@ -8902,8 +10569,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -14323,7 +14176,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8919,32 +10586,34 @@
+@@ -8916,32 +10583,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14365,7 +14218,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8957,27 +10626,41 @@
+@@ -8954,27 +10623,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14414,7 +14267,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8985,8 +10668,8 @@
+@@ -8982,8 +10665,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -14425,7 +14278,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8999,32 +10682,34 @@
+@@ -8996,32 +10679,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14467,7 +14320,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9037,27 +10722,41 @@
+@@ -9034,27 +10719,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14516,7 +14369,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9072,6 +10771,7 @@
+@@ -9069,6 +10768,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -14524,7 +14377,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9091,21 +10791,32 @@
+@@ -9088,21 +10788,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -14561,7 +14414,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9125,7 +10836,7 @@
+@@ -9122,7 +10833,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -14570,7 +14423,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9157,17 +10868,17 @@
+@@ -9154,17 +10865,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -14594,7 +14447,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9187,7 +10898,7 @@
+@@ -9184,7 +10895,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -14603,7 +14456,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9219,11 +10930,11 @@
+@@ -9216,11 +10927,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -14619,7 +14472,7 @@
  fi
  
    else
-@@ -9238,21 +10949,21 @@
+@@ -9235,22 +10946,22 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -14643,12 +14496,14 @@
  else
    pic_mode=default
 -fi;
+-test -z "$pic_mode" && pic_mode=default
 +fi
 +
- test -z "$pic_mode" && pic_mode=default
++test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -9282,68 +10993,25 @@
+ tagname=
+@@ -9279,68 +10990,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14732,7 +14587,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9357,8 +11025,8 @@
+@@ -9354,8 +11022,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -14743,7 +14598,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9372,26 +11040,28 @@
+@@ -9369,26 +11037,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -14751,13 +14606,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9378: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11046: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9375: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11043: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9382: \$? = $ac_status" >&5
-+   echo "$as_me:11050: \$? = $ac_status" >&5
+-   echo "$as_me:9379: \$? = $ac_status" >&5
++   echo "$as_me:11047: \$? = $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
@@ -14779,7 +14634,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9405,8 +11075,8 @@
+@@ -9402,8 +11072,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -14790,7 +14645,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9444,6 +11114,11 @@
+@@ -9441,6 +11111,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -14802,7 +14657,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9460,7 +11135,7 @@
+@@ -9457,7 +11132,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -14811,7 +14666,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9486,6 +11161,16 @@
+@@ -9483,6 +11158,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -14828,7 +14683,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9497,7 +11182,7 @@
+@@ -9494,7 +11179,7 @@
        lt_prog_compiler_wl='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -14837,7 +14692,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9520,13 +11205,20 @@
+@@ -9517,13 +11202,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14860,7 +14715,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9541,15 +11233,15 @@
+@@ -9538,15 +11230,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -14882,7 +14737,7 @@
        ;;
  
      sunos4*)
-@@ -9558,7 +11250,7 @@
+@@ -9555,7 +11247,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14891,7 +14746,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9571,6 +11263,17 @@
+@@ -9568,6 +11260,17 @@
        fi
        ;;
  
@@ -14909,7 +14764,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9582,16 +11285,16 @@
+@@ -9579,16 +11282,16 @@
      esac
    fi
  
@@ -14930,7 +14785,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9605,26 +11308,28 @@
+@@ -9602,26 +11305,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -14938,13 +14793,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9611: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11314: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9608: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11311: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9615: \$? = $ac_status" >&5
-+   echo "$as_me:11318: \$? = $ac_status" >&5
+-   echo "$as_me:9612: \$? = $ac_status" >&5
++   echo "$as_me:11315: \$? = $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
@@ -14966,7 +14821,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9637,7 +11342,7 @@
+@@ -9634,7 +11339,7 @@
  fi
  
  fi
@@ -14975,7 +14830,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9647,8 +11352,50 @@
+@@ -9644,8 +11349,50 @@
      ;;
  esac
  
@@ -15028,7 +14883,7 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9659,60 +11406,58 @@
+@@ -9656,60 +11403,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -15049,13 +14904,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9678: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11418: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9675: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11415: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9682: \$? = $ac_status" >&5
-+   echo "$as_me:11422: \$? = $ac_status" >&5
+-   echo "$as_me:9679: \$? = $ac_status" >&5
++   echo "$as_me:11419: \$? = $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
@@ -15107,7 +14962,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9722,8 +11467,8 @@
+@@ -9719,8 +11464,8 @@
    need_locks=no
  fi
  
@@ -15118,7 +14973,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9761,6 +11506,16 @@
+@@ -9758,6 +11503,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -15135,7 +14990,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9771,6 +11526,10 @@
+@@ -9768,6 +11523,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -15146,7 +15001,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9781,6 +11540,27 @@
+@@ -9778,6 +11537,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -15174,7 +15029,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9818,7 +11598,7 @@
+@@ -9815,7 +11595,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -15183,7 +15038,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9828,13 +11608,13 @@
+@@ -9825,13 +11605,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec='-L$libdir'
@@ -15200,7 +15055,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9843,23 +11623,70 @@
+@@ -9840,23 +11620,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -15276,7 +15131,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9873,13 +11700,40 @@
+@@ -9870,13 +11697,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15319,7 +15174,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9889,24 +11743,19 @@
+@@ -9886,24 +11740,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15351,7 +15206,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9918,7 +11767,7 @@
+@@ -9915,7 +11764,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -15360,7 +15215,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9940,9 +11789,21 @@
+@@ -9937,9 +11786,21 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -15384,7 +15239,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9959,7 +11820,7 @@
+@@ -9956,7 +11817,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -15393,7 +15248,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9978,8 +11839,12 @@
+@@ -9975,8 +11836,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -15406,7 +15261,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9987,22 +11852,23 @@
+@@ -9984,22 +11849,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -15437,7 +15292,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10018,24 +11884,36 @@
+@@ -10015,24 +11881,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15482,7 +15337,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10049,19 +11927,20 @@
+@@ -10046,19 +11924,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15508,7 +15363,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10080,24 +11959,36 @@
+@@ -10077,24 +11956,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15553,7 +15408,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10111,8 +12002,10 @@
+@@ -10108,8 +11999,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15565,7 +15420,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10121,13 +12014,11 @@
+@@ -10118,13 +12011,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -15582,7 +15437,7 @@
  	fi
        fi
        ;;
-@@ -10140,7 +12031,7 @@
+@@ -10137,7 +12028,7 @@
        ld_shlibs=no
        ;;
  
@@ -15591,7 +15446,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10150,13 +12041,13 @@
+@@ -10147,13 +12038,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -15608,7 +15463,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -10166,52 +12057,52 @@
+@@ -10163,52 +12054,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -15701,7 +15556,7 @@
      fi
        ;;
  
-@@ -10245,8 +12136,8 @@
+@@ -10242,8 +12133,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15712,7 +15567,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10254,7 +12145,7 @@
+@@ -10251,7 +12142,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -15721,7 +15576,7 @@
        else
  	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -10268,47 +12159,62 @@
+@@ -10265,47 +12156,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -15808,7 +15663,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10322,7 +12228,7 @@
+@@ -10319,7 +12225,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -15817,7 +15672,7 @@
        else
  	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10332,7 +12238,7 @@
+@@ -10329,7 +12235,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -15826,7 +15681,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10355,7 +12261,8 @@
+@@ -10352,7 +12258,8 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -15836,7 +15691,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10365,7 +12272,7 @@
+@@ -10362,7 +12269,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -15845,7 +15700,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10376,14 +12283,14 @@
+@@ -10373,14 +12280,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -15862,7 +15717,7 @@
        else
  	allow_undefined_flag=' -expect_unresolved \*'
  	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10395,13 +12302,13 @@
+@@ -10392,13 +12299,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15878,7 +15733,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10409,21 +12316,15 @@
+@@ -10406,21 +12313,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -15904,7 +15759,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10432,8 +12333,18 @@
+@@ -10429,8 +12330,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15925,7 +15780,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10442,7 +12353,7 @@
+@@ -10439,7 +12350,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -15934,7 +15789,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10490,36 +12401,45 @@
+@@ -10487,36 +12398,45 @@
        fi
        ;;
  
@@ -16001,7 +15856,7 @@
        ;;
  
      uts4*)
-@@ -10534,15 +12454,10 @@
+@@ -10531,15 +12451,10 @@
      esac
    fi
  
@@ -16019,7 +15874,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10560,8 +12475,8 @@
+@@ -10557,8 +12472,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -16030,7 +15885,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10575,6 +12490,7 @@
+@@ -10572,6 +12487,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -16038,7 +15893,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10597,20 +12513,20 @@
+@@ -10594,20 +12510,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -16064,7 +15919,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10620,7 +12536,20 @@
+@@ -10617,7 +12533,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16086,7 +15941,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10685,7 +12614,7 @@
+@@ -10682,7 +12611,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16095,7 +15950,7 @@
    ;;
  
  beos*)
-@@ -10694,7 +12623,7 @@
+@@ -10691,7 +12620,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -16104,7 +15959,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10710,7 +12639,7 @@
+@@ -10707,7 +12636,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -16113,7 +15968,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10722,7 +12651,8 @@
+@@ -10719,7 +12648,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -16123,7 +15978,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10752,7 +12682,7 @@
+@@ -10749,7 +12679,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -16132,7 +15987,7 @@
        ;;
      esac
      ;;
-@@ -10775,7 +12705,7 @@
+@@ -10772,7 +12702,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -16141,7 +15996,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10798,22 +12728,19 @@
+@@ -10795,20 +12725,17 @@
    dynamic_linker=no
    ;;
  
@@ -16159,8 +16014,6 @@
 -
 -freebsd*)
 -  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
--  case $version_type in
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -16172,12 +16025,10 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
+   version_type=freebsd-$objformat
+   case $version_type in
      freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-       need_version=no
-@@ -10829,14 +12756,19 @@
+@@ -10826,14 +12753,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -16199,7 +16050,7 @@
    esac
    ;;
  
-@@ -10856,9 +12788,9 @@
+@@ -10853,9 +12785,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -16211,7 +16062,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10873,7 +12805,7 @@
+@@ -10870,7 +12802,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -16220,7 +16071,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10884,7 +12816,7 @@
+@@ -10881,7 +12813,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -16229,7 +16080,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10896,6 +12828,18 @@
+@@ -10893,6 +12825,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -16248,7 +16099,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10939,29 +12883,26 @@
+@@ -10936,29 +12880,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -16285,7 +16136,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10971,6 +12912,18 @@
+@@ -10968,6 +12909,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -16304,7 +16155,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10980,7 +12933,7 @@
+@@ -10977,7 +12930,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -16313,7 +16164,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11008,8 +12961,13 @@
+@@ -11005,8 +12958,13 @@
  
  openbsd*)
    version_type=sunos
@@ -16328,7 +16179,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -11029,7 +12987,7 @@
+@@ -11026,7 +12984,7 @@
  
  os2*)
    libname_spec='$name'
@@ -16337,7 +16188,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11047,13 +13005,6 @@
+@@ -11044,13 +13002,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -16351,7 +16202,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11079,7 +13030,7 @@
+@@ -11076,7 +13027,7 @@
    need_version=yes
    ;;
  
@@ -16360,7 +16211,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11112,6 +13063,29 @@
+@@ -11109,6 +13060,29 @@
    fi
    ;;
  
@@ -16390,7 +16241,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11123,16 +13097,21 @@
+@@ -11120,16 +13094,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -16418,7 +16269,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11152,8 +13131,8 @@
+@@ -11149,8 +13128,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -16429,7 +16280,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11166,29 +13145,29 @@
+@@ -11163,29 +13142,29 @@
  
  striplib=
  old_striplib=
@@ -16469,7 +16320,7 @@
      ;;
    esac
  fi
-@@ -11220,8 +13199,8 @@
+@@ -11217,8 +13196,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -16480,7 +16331,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11234,40 +13213,52 @@
+@@ -11231,40 +13210,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16545,7 +16396,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11276,14 +13267,15 @@
+@@ -11273,14 +13264,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16565,7 +16416,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11297,8 +13289,8 @@
+@@ -11294,8 +13286,8 @@
     ;;
  
    *)
@@ -16576,7 +16427,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11325,53 +13317,59 @@
+@@ -11322,53 +13314,59 @@
  
  #undef shl_load
  
@@ -16655,7 +16506,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11380,18 +13378,19 @@
+@@ -11377,18 +13375,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16681,7 +16532,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11404,40 +13403,52 @@
+@@ -11401,40 +13400,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16746,7 +16597,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11446,19 +13457,20 @@
+@@ -11443,19 +13454,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16773,7 +16624,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11485,53 +13497,59 @@
+@@ -11482,53 +13494,59 @@
  
  #undef dlopen
  
@@ -16852,7 +16703,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11540,18 +13558,19 @@
+@@ -11537,18 +13555,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16878,7 +16729,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11564,40 +13583,52 @@
+@@ -11561,40 +13580,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16943,7 +16794,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11606,19 +13637,20 @@
+@@ -11603,19 +13634,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16970,7 +16821,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11631,40 +13663,52 @@
+@@ -11628,40 +13660,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17035,7 +16886,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11673,19 +13717,20 @@
+@@ -11670,19 +13714,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17062,7 +16913,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11698,40 +13743,52 @@
+@@ -11695,40 +13740,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17127,7 +16978,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11740,14 +13797,15 @@
+@@ -11737,14 +13794,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17147,7 +16998,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11782,13 +13840,13 @@
+@@ -11779,13 +13837,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -17164,16 +17015,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11798,7 +13856,7 @@
+@@ -11795,7 +13853,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11801 "configure"
-+#line 13859 "configure"
+-#line 11798 "configure"
++#line 13856 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11855,6 +13913,8 @@
+@@ -11852,6 +13910,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -17182,7 +17033,7 @@
  
      exit (status);
  }
-@@ -11864,12 +13924,12 @@
+@@ -11861,12 +13921,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -17197,7 +17048,7 @@
      esac
    else :
      # compilation failed
-@@ -11880,13 +13940,13 @@
+@@ -11877,13 +13937,13 @@
  
  
  fi
@@ -17216,16 +17067,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11896,7 +13956,7 @@
+@@ -11893,7 +13953,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11899 "configure"
-+#line 13959 "configure"
+-#line 11896 "configure"
++#line 13956 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11953,6 +14013,8 @@
+@@ -11950,6 +14010,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -17234,7 +17085,7 @@
  
      exit (status);
  }
-@@ -11962,12 +14024,12 @@
+@@ -11959,12 +14021,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -17249,7 +17100,7 @@
      esac
    else :
      # compilation failed
-@@ -11978,8 +14040,8 @@
+@@ -11975,8 +14037,8 @@
  
  
  fi
@@ -17260,7 +17111,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -12000,19 +14062,19 @@
+@@ -11997,19 +14059,19 @@
  fi
  
  
@@ -17288,7 +17139,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12021,58 +14083,21 @@
+@@ -12018,58 +14080,21 @@
    fi
    ;;
  
@@ -17354,7 +17205,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12087,7 +14112,8 @@
+@@ -12084,7 +14109,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -17364,7 +17215,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12201,11 +14227,11 @@
+@@ -12198,11 +14224,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17378,7 +17229,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12235,6 +14261,12 @@
+@@ -12232,6 +14258,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -17391,7 +17242,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12246,6 +14278,9 @@
+@@ -12243,6 +14275,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -17401,7 +17252,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12265,7 +14300,7 @@
+@@ -12262,7 +14297,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -17410,7 +17261,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12296,7 +14331,7 @@
+@@ -12293,7 +14328,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -17419,7 +17270,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12311,7 +14346,7 @@
+@@ -12308,7 +14343,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -17428,7 +17279,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12538,7 +14573,10 @@
+@@ -12535,7 +14570,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -17440,7 +17291,7 @@
  fi
  
  
-@@ -12551,11 +14589,11 @@
+@@ -12548,11 +14586,11 @@
  CC="$lt_save_CC"
  
  
@@ -17456,7 +17307,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12573,6 +14611,9 @@
+@@ -12570,6 +14608,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -17466,7 +17317,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12603,8 +14644,10 @@
+@@ -12600,8 +14641,10 @@
  
        case $tagname in
        CXX)
@@ -17479,7 +17330,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12623,6 +14666,7 @@
+@@ -12620,6 +14663,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -17487,7 +17338,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12640,7 +14684,7 @@
+@@ -12637,7 +14681,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -17496,7 +17347,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12650,17 +14694,34 @@
+@@ -12647,17 +14691,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -17532,7 +17383,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12671,18 +14732,27 @@
+@@ -12668,18 +14729,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -17563,7 +17414,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12696,18 +14766,18 @@
+@@ -12693,18 +14763,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -17588,7 +17439,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12736,11 +14806,11 @@
+@@ -12733,11 +14803,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -17604,7 +17455,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12753,7 +14823,7 @@
+@@ -12750,7 +14820,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -17613,7 +17464,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -12773,21 +14843,21 @@
+@@ -12770,21 +14840,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -17642,7 +17493,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12797,8 +14867,8 @@
+@@ -12794,8 +14864,8 @@
    ;;
  esac
  fi
@@ -17653,7 +17504,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12806,8 +14876,8 @@
+@@ -12803,8 +14873,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -17664,7 +17515,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12833,7 +14903,7 @@
+@@ -12830,7 +14900,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -17673,7 +17524,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12848,8 +14918,8 @@
+@@ -12845,8 +14915,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -17684,7 +17535,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12864,8 +14934,23 @@
+@@ -12861,8 +14931,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -17710,7 +17561,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12882,7 +14967,7 @@
+@@ -12879,7 +14964,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -17719,7 +17570,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12901,8 +14986,12 @@
+@@ -12898,8 +14983,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -17732,7 +17583,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12911,15 +15000,16 @@
+@@ -12908,15 +14997,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -17753,7 +17604,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -12941,24 +15031,36 @@
+@@ -12938,24 +15028,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17798,7 +17649,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12972,20 +15074,21 @@
+@@ -12969,20 +15071,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17824,7 +17675,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13004,24 +15107,36 @@
+@@ -13001,24 +15104,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17869,7 +17720,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13035,8 +15150,10 @@
+@@ -13032,8 +15147,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17881,7 +17732,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -13045,16 +15162,26 @@
+@@ -13042,16 +15159,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17913,7 +17764,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13068,12 +15195,12 @@
+@@ -13065,12 +15192,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
      # as there is no search path for DLLs.
      hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -17928,7 +17779,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13082,70 +15209,81 @@
+@@ -13079,70 +15206,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -18062,7 +17913,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13156,14 +15294,14 @@
+@@ -13153,14 +15291,14 @@
  	;;
      esac
      ;;
@@ -18079,7 +17930,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13180,12 +15318,12 @@
+@@ -13177,12 +15315,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -18095,7 +17946,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13194,11 +15332,11 @@
+@@ -13191,11 +15329,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -18109,7 +17960,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13208,33 +15346,22 @@
+@@ -13205,33 +15343,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -18150,7 +18001,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13245,17 +15372,20 @@
+@@ -13242,17 +15369,20 @@
      esac
  
      case $cc_basename in
@@ -18177,7 +18028,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13271,12 +15401,15 @@
+@@ -13268,12 +15398,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -18197,7 +18048,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13287,11 +15420,25 @@
+@@ -13284,11 +15417,25 @@
  	;;
      esac
      ;;
@@ -18225,7 +18076,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13302,9 +15449,9 @@
+@@ -13299,9 +15446,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -18237,7 +18088,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13313,16 +15460,16 @@
+@@ -13310,16 +15457,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -18258,7 +18109,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13340,20 +15487,44 @@
+@@ -13337,20 +15484,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -18309,7 +18160,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13381,7 +15552,7 @@
+@@ -13378,7 +15549,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -18318,7 +18169,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13391,7 +15562,7 @@
+@@ -13388,7 +15559,7 @@
  	;;
      esac
      ;;
@@ -18327,10 +18178,19 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13402,15 +15573,31 @@
+@@ -13399,15 +15570,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
+-  osf3*)
+-    case $cc_basename in
+-      KCC)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+-
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 +  openbsd2*)
 +    # C++ shared libraries are fairly broken
 +    ld_shlibs_CXX=no
@@ -18347,21 +18207,19 @@
 +    fi
 +    output_verbose_link_cmd='echo'
 +    ;;
-   osf3*)
-     case $cc_basename in
--      KCC)
++  osf3*)
++    case $cc_basename in
 +      KCC*)
- 	# Kuck and Associates, Inc. (KAI) C++ Compiler
- 
- 	# KCC will only create a shared library if the output file
- 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
- 	# to its proper name (with version) after linking.
--	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
 +	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13420,14 +15607,14 @@
+@@ -13417,14 +15604,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -18379,7 +18237,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13445,7 +15632,7 @@
+@@ -13442,7 +15629,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18388,7 +18246,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13464,13 +15651,13 @@
+@@ -13461,13 +15648,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -18404,7 +18262,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13479,17 +15666,17 @@
+@@ -13476,17 +15663,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -18426,7 +18284,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13508,7 +15695,7 @@
+@@ -13505,7 +15692,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18435,41 +18293,37 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13529,28 +15716,15 @@
+@@ -13526,27 +15713,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
 -  sco*)
 -    archive_cmds_need_lc_CXX=no
-+  sunos4*)
-     case $cc_basename in
+-    case $cc_basename in
 -      CC)
-+      CC*)
-+	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
 -      *)
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
 -    esac
 -    ;;
--  sunos4*)
--    case $cc_basename in
+   sunos4*)
+     case $cc_basename in
 -      CC)
--	# Sun C++ 4.x
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
 -      lcc)
--	# Lucid
 +      lcc*)
-+	# Lucid
+ 	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
- 	;;
-@@ -13562,36 +15736,33 @@
+@@ -13559,36 +15733,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -18518,7 +18372,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13599,9 +15770,9 @@
+@@ -13596,9 +15767,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -18530,7 +18384,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13611,9 +15782,9 @@
+@@ -13608,9 +15779,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -18542,7 +18396,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13622,9 +15793,9 @@
+@@ -13619,9 +15790,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -18554,7 +18408,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13637,12 +15808,63 @@
+@@ -13634,12 +15805,63 @@
  	;;
      esac
      ;;
@@ -18620,7 +18474,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13662,8 +15884,8 @@
+@@ -13659,8 +15881,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -18631,7 +18485,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13699,7 +15921,7 @@
+@@ -13696,7 +15918,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -18640,7 +18494,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13739,7 +15961,7 @@
+@@ -13736,7 +15958,7 @@
         fi
         ;;
  
@@ -18649,7 +18503,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13775,6 +15997,29 @@
+@@ -13772,6 +15994,29 @@
  
  $rm -f confest.$objext
  
@@ -18679,7 +18533,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13783,8 +16028,8 @@
+@@ -13780,8 +16025,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -18690,7 +18544,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13822,6 +16067,10 @@
+@@ -13819,6 +16064,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -18701,7 +18555,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13830,7 +16079,7 @@
+@@ -13827,7 +16076,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18710,7 +18564,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13855,18 +16104,28 @@
+@@ -13852,18 +16101,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -18742,7 +18596,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13874,22 +16133,22 @@
+@@ -13871,22 +16130,22 @@
  	    ;;
  	esac
  	;;
@@ -18771,7 +18625,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13902,9 +16161,13 @@
+@@ -13899,9 +16158,13 @@
  	    ;;
  	esac
  	;;
@@ -18786,7 +18640,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13913,20 +16176,26 @@
+@@ -13910,20 +16173,26 @@
  	    ;;
  	esac
  	;;
@@ -18817,7 +18671,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13943,25 +16212,25 @@
+@@ -13940,25 +16209,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -18848,7 +18702,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13975,24 +16244,15 @@
+@@ -13972,24 +16241,15 @@
  	;;
        psos*)
  	;;
@@ -18875,7 +18729,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -14002,12 +16262,12 @@
+@@ -13999,12 +16259,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -18890,7 +18744,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14017,7 +16277,7 @@
+@@ -14014,7 +16274,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -18899,7 +18753,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14025,7 +16285,14 @@
+@@ -14022,7 +16282,14 @@
  	    ;;
  	esac
  	;;
@@ -18915,7 +18769,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14035,16 +16302,16 @@
+@@ -14032,16 +16299,16 @@
      esac
    fi
  
@@ -18936,7 +18790,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14058,26 +16325,28 @@
+@@ -14055,26 +16322,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -18944,13 +18798,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14064: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16331: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14061: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16328: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14068: \$? = $ac_status" >&5
-+   echo "$as_me:16335: \$? = $ac_status" >&5
+-   echo "$as_me:14065: \$? = $ac_status" >&5
++   echo "$as_me:16332: \$? = $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
@@ -18972,7 +18826,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14090,7 +16359,7 @@
+@@ -14087,7 +16356,7 @@
  fi
  
  fi
@@ -18981,7 +18835,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14100,8 +16369,50 @@
+@@ -14097,8 +16366,50 @@
      ;;
  esac
  
@@ -19034,7 +18888,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14112,60 +16423,58 @@
+@@ -14109,60 +16420,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -19055,13 +18909,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14131: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16435: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14128: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16432: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14135: \$? = $ac_status" >&5
-+   echo "$as_me:16439: \$? = $ac_status" >&5
+-   echo "$as_me:14132: \$? = $ac_status" >&5
++   echo "$as_me:16436: \$? = $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
@@ -19113,7 +18967,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14175,8 +16484,8 @@
+@@ -14172,8 +16481,8 @@
    need_locks=no
  fi
  
@@ -19124,7 +18978,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14193,22 +16502,20 @@
+@@ -14190,22 +16499,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -19153,7 +19007,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14226,8 +16533,8 @@
+@@ -14223,8 +16530,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -19164,7 +19018,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14241,6 +16548,7 @@
+@@ -14238,6 +16545,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -19172,7 +19026,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14263,20 +16571,20 @@
+@@ -14260,20 +16568,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -19198,7 +19052,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14286,7 +16594,20 @@
+@@ -14283,7 +16591,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19220,7 +19074,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14351,7 +16672,7 @@
+@@ -14348,7 +16669,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -19229,7 +19083,7 @@
    ;;
  
  beos*)
-@@ -14360,7 +16681,7 @@
+@@ -14357,7 +16678,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -19238,7 +19092,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14376,7 +16697,7 @@
+@@ -14373,7 +16694,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -19247,7 +19101,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14388,7 +16709,8 @@
+@@ -14385,7 +16706,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -19257,7 +19111,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14418,7 +16740,7 @@
+@@ -14415,7 +16737,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -19266,7 +19120,7 @@
        ;;
      esac
      ;;
-@@ -14441,7 +16763,7 @@
+@@ -14438,7 +16760,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -19275,7 +19129,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14464,20 +16786,17 @@
+@@ -14461,20 +16783,17 @@
    dynamic_linker=no
    ;;
  
@@ -19307,7 +19161,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14495,14 +16814,19 @@
+@@ -14492,14 +16811,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -19329,7 +19183,7 @@
    esac
    ;;
  
-@@ -14522,9 +16846,9 @@
+@@ -14519,9 +16843,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -19341,7 +19195,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14539,7 +16863,7 @@
+@@ -14536,7 +16860,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -19350,7 +19204,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14550,7 +16874,7 @@
+@@ -14547,7 +16871,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -19359,7 +19213,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14562,6 +16886,18 @@
+@@ -14559,6 +16883,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -19378,7 +19232,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14605,29 +16941,26 @@
+@@ -14602,29 +16938,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -19415,7 +19269,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14637,6 +16970,18 @@
+@@ -14634,6 +16967,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19434,7 +19288,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14646,7 +16991,7 @@
+@@ -14643,7 +16988,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -19443,7 +19297,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14674,8 +17019,13 @@
+@@ -14671,8 +17016,13 @@
  
  openbsd*)
    version_type=sunos
@@ -19458,7 +19312,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14695,7 +17045,7 @@
+@@ -14692,7 +17042,7 @@
  
  os2*)
    libname_spec='$name'
@@ -19467,7 +19321,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14713,13 +17063,6 @@
+@@ -14710,13 +17060,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -19481,7 +19335,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14745,7 +17088,7 @@
+@@ -14742,7 +17085,7 @@
    need_version=yes
    ;;
  
@@ -19490,7 +19344,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14778,6 +17121,29 @@
+@@ -14775,6 +17118,29 @@
    fi
    ;;
  
@@ -19520,7 +19374,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14789,16 +17155,21 @@
+@@ -14786,16 +17152,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -19548,7 +19402,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14818,8 +17189,8 @@
+@@ -14815,8 +17186,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -19559,7 +19413,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14830,1266 +17201,444 @@
+@@ -14827,1258 +17198,436 @@
    enable_fast_install=needless
  fi
  
@@ -20361,7 +20215,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15467 "configure"
+-#line 15464 "configure"
 -#include "confdefs.h"
 +# Do we need a version for libraries?
 +need_version=$need_version
@@ -20481,7 +20335,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15565 "configure"
+-#line 15562 "configure"
 -#include "confdefs.h"
 +# List of archive names.  First name is the real one, the rest are links.
 +# The last name is the one that the linker finds with -lNAME.
@@ -20685,7 +20539,9 @@
 -    lt_cv_prog_compiler_c_o_CXX \
 -    exclude_expsyms_CXX \
 -    include_expsyms_CXX; do
--
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+ 
 -    case $var in
 -    old_archive_cmds_CXX | \
 -    old_archive_from_new_cmds_CXX | \
@@ -20707,174 +20563,169 @@
 -      ;;
 -    esac
 -  done
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
  
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 -    ;;
 -  esac
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
- 
--cfgfile="$ofile"
 +# Commands used to finish a libtool library installation in a directory.
 +finish_cmds=$lt_finish_cmds
  
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-cfgfile="$ofile"
 +# Same as above, but a single script fragment to be evaled but not shown.
 +finish_eval=$lt_finish_eval
  
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 +# Take the output of nm and produce a listing of raw symbols and C names.
 +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
  
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +# Transform the output of nm in a proper C declaration
 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
  
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 +# Transform the output of nm in a C name address pair
 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
 +# This is the shared library runtime path variable.
 +runpath_var=$runpath_var
  
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
 +# This is the shared library path variable.
 +shlibpath_var=$shlibpath_var
  
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
 +# Is shlibpath searched before the hard-coded library search path?
 +shlibpath_overrides_runpath=$shlibpath_overrides_runpath
  
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
 +# How to hardcode a shared library path into an executable.
 +hardcode_action=$hardcode_action_CXX
  
--# The host system.
--host_alias=$host_alias
--host=$host
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
 +# Whether we should hardcode library paths into libraries.
 +hardcode_into_libs=$hardcode_into_libs
  
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# The host system.
+-host_alias=$host_alias
+-host=$host
 +# Flag to hardcode \$libdir into a binary during linking.
 +# This must work even if \$libdir does not exist.
 +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
  
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
 +# If ld is used when linking, flag to hardcode \$libdir into
 +# a binary during linking. This must work even if \$libdir does
 +# not exist.
 +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
  
--# A C compiler.
--LTCC=$lt_LTCC
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
 +# Whether we need a single -rpath flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
  
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+-# A C compiler.
+-LTCC=$lt_LTCC
 +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_direct=$hardcode_direct_CXX
  
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
 +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_minus_L=$hardcode_minus_L_CXX
  
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
 +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 +# the resulting binary.
 +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
  
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-# An ERE matcher.
+-EGREP=$lt_EGREP
 +# Set to yes if building a shared library automatically hardcodes DIR into the library
 +# and all subsequent libraries and executables linked against it.
 +hardcode_automatic=$hardcode_automatic_CXX
  
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
 +# Variables whose values should be saved in libtool wrapper scripts and
 +# restored at relink time.
 +variables_saved_for_relink="$variables_saved_for_relink"
  
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
 +# Whether libtool must link a program against all its dependency libraries.
 +link_all_deplibs=$link_all_deplibs_CXX
  
--# A symbol stripping program
--STRIP=$STRIP
+-# A BSD-compatible nm program.
+-NM=$lt_NM
 +# Compile-time system search path for libraries
 +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
  
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# A symbol stripping program
+-STRIP=$STRIP
 +# Run-time system search path for libraries
 +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
 +# Fix the shell variable \$srcfile for the compiler.
 +fix_srcfile_path="$fix_srcfile_path_CXX"
  
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
 +# Set to yes if exported symbols are required.
 +always_export_symbols=$always_export_symbols_CXX
  
--# Used on cygwin: assembler.
--AS="$AS"
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
 +# The commands to list exported symbols.
 +export_symbols_cmds=$lt_export_symbols_cmds_CXX
  
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# Used on cygwin: assembler.
+-AS="$AS"
 +# The commands to extract the exported symbol list from a shared archive.
 +extract_expsyms_cmds=$lt_extract_expsyms_cmds
  
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
+ 
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
  
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl_CXX
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
++# ### END LIBTOOL TAG CONFIG: $tagname
  
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+# ### END LIBTOOL TAG CONFIG: $tagname
++__EOF__
  
 -# Old archive suffix (normally "a").
 -libext="$libext"
-+__EOF__
  
 -# Shared library suffix (normally ".so").
 -shrext='$shrext'
- 
--# Executable file suffix (normally "").
--exeext="$exeext"
 +else
 +  # If there is no Makefile yet, we rely on a make rule to execute
 +  # `config.status --recheck' to rerun these tests and create the
@@ -20885,20 +20736,20 @@
 +  fi
 +fi
  
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+ 
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic_CXX
 -pic_mode=$pic_mode
- 
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
 +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
  
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
 +CC=$lt_save_CC
 +LDCXX=$LD
 +LD=$lt_save_LD
@@ -20910,18 +20761,15 @@
 +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
  
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-
 -# Must we lock files when doing compilation ?
 -need_locks=$lt_need_locks
-+	else
-+	  tagname=""
-+	fi
-+	;;
- 
+-
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
-+      F77)
-+	if test -n "$F77" && test "X$F77" != "Xno"; then
- 
+-
 -# Do we need a version for libraries?
 -need_version=$need_version
 -
@@ -21143,22 +20991,14 @@
 -	  tagname=""
 -	fi
 -	;;
--
--      F77)
--	if test -n "$F77" && test "X$F77" != "Xno"; then
--
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++	else
++	  tagname=""
++	fi
++	;;
  
- 
- archive_cmds_need_lc_F77=no
-@@ -16129,29 +17678,55 @@
+       F77)
+ 	if test -n "$F77" && test "X$F77" != "Xno"; then
+@@ -16126,29 +17675,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -21222,7 +21062,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16159,21 +17734,21 @@
+@@ -16156,21 +17731,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -21254,7 +21094,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16182,8 +17757,8 @@
+@@ -16179,8 +17754,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -21265,7 +21105,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16221,6 +17796,11 @@
+@@ -16218,6 +17793,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -21277,7 +21117,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16237,7 +17817,7 @@
+@@ -16234,7 +17814,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -21286,7 +21126,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16263,6 +17843,16 @@
+@@ -16260,6 +17840,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -21303,7 +21143,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16274,7 +17864,7 @@
+@@ -16271,7 +17861,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -21312,7 +21152,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16297,13 +17887,20 @@
+@@ -16294,13 +17884,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -21335,7 +21175,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16318,15 +17915,15 @@
+@@ -16315,15 +17912,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -21357,7 +21197,7 @@
        ;;
  
      sunos4*)
-@@ -16335,7 +17932,7 @@
+@@ -16332,7 +17929,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -21366,7 +21206,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16348,27 +17945,38 @@
+@@ -16345,27 +17942,38 @@
        fi
        ;;
  
@@ -21381,9 +21221,8 @@
 -    *)
 +    unicos*)
 +      lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_can_build_shared_F77=no
-       ;;
--    esac
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
 +
 +    uts4*)
 +      lt_prog_compiler_pic_F77='-pic'
@@ -21391,9 +21230,9 @@
 +      ;;
 +
 +    *)
-+      lt_prog_compiler_can_build_shared_F77=no
-+      ;;
-+    esac
+       lt_prog_compiler_can_build_shared_F77=no
+       ;;
+     esac
    fi
  
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
@@ -21413,7 +21252,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16382,26 +17990,28 @@
+@@ -16379,26 +17987,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -21421,13 +21260,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16388: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17996: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16385: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17993: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16392: \$? = $ac_status" >&5
-+   echo "$as_me:18000: \$? = $ac_status" >&5
+-   echo "$as_me:16389: \$? = $ac_status" >&5
++   echo "$as_me:17997: \$? = $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
@@ -21449,7 +21288,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16414,7 +18024,7 @@
+@@ -16411,7 +18021,7 @@
  fi
  
  fi
@@ -21458,7 +21297,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16424,8 +18034,50 @@
+@@ -16421,8 +18031,50 @@
      ;;
  esac
  
@@ -21511,7 +21350,7 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16436,60 +18088,58 @@
+@@ -16433,60 +18085,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -21532,13 +21371,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16455: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18100: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16452: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18097: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16459: \$? = $ac_status" >&5
-+   echo "$as_me:18104: \$? = $ac_status" >&5
+-   echo "$as_me:16456: \$? = $ac_status" >&5
++   echo "$as_me:18101: \$? = $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
@@ -21590,7 +21429,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16499,8 +18149,8 @@
+@@ -16496,8 +18146,8 @@
    need_locks=no
  fi
  
@@ -21601,7 +21440,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16538,6 +18188,16 @@
+@@ -16535,6 +18185,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -21618,7 +21457,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16548,6 +18208,10 @@
+@@ -16545,6 +18205,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -21629,7 +21468,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16558,6 +18222,27 @@
+@@ -16555,6 +18219,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -21657,7 +21496,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16595,7 +18280,7 @@
+@@ -16592,7 +18277,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -21666,7 +21505,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16605,13 +18290,13 @@
+@@ -16602,13 +18287,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -21683,7 +21522,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16620,23 +18305,70 @@
+@@ -16617,23 +18302,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -21760,7 +21599,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16650,13 +18382,40 @@
+@@ -16647,13 +18379,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21803,7 +21642,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16666,24 +18425,19 @@
+@@ -16663,24 +18422,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21835,7 +21674,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16695,7 +18449,7 @@
+@@ -16692,7 +18446,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -21844,7 +21683,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16717,9 +18471,21 @@
+@@ -16714,9 +18468,21 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -21868,7 +21707,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16736,7 +18502,7 @@
+@@ -16733,7 +18499,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -21877,7 +21716,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16755,8 +18521,12 @@
+@@ -16752,8 +18518,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -21890,7 +21729,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16764,45 +18534,58 @@
+@@ -16761,45 +18531,58 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -21964,7 +21803,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16816,19 +18599,20 @@
+@@ -16813,19 +18596,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21990,7 +21829,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16837,24 +18621,36 @@
+@@ -16834,24 +18618,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22035,7 +21874,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16868,8 +18664,10 @@
+@@ -16865,8 +18661,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22047,7 +21886,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16878,13 +18676,11 @@
+@@ -16875,13 +18673,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -22064,7 +21903,7 @@
  	fi
        fi
        ;;
-@@ -16897,7 +18693,7 @@
+@@ -16894,7 +18690,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -22073,7 +21912,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16907,68 +18703,68 @@
+@@ -16904,68 +18700,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -22186,7 +22025,7 @@
      fi
        ;;
  
-@@ -17002,8 +18798,8 @@
+@@ -16999,8 +18795,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -22197,7 +22036,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17011,7 +18807,7 @@
+@@ -17008,7 +18804,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -22206,7 +22045,7 @@
        else
  	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -17025,47 +18821,62 @@
+@@ -17022,47 +18818,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -22293,7 +22132,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17079,7 +18890,7 @@
+@@ -17076,7 +18887,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -22302,7 +22141,7 @@
        else
  	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17089,7 +18900,7 @@
+@@ -17086,7 +18897,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -22311,7 +22150,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17112,7 +18923,8 @@
+@@ -17109,7 +18920,8 @@
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -22321,7 +22160,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17122,7 +18934,7 @@
+@@ -17119,7 +18931,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -22330,7 +22169,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17133,14 +18945,14 @@
+@@ -17130,14 +18942,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -22347,7 +22186,7 @@
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
  	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17152,13 +18964,13 @@
+@@ -17149,13 +18961,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -22363,7 +22202,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17166,21 +18978,15 @@
+@@ -17163,21 +18975,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -22389,7 +22228,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17189,8 +18995,18 @@
+@@ -17186,8 +18992,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -22410,7 +22249,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17199,7 +19015,7 @@
+@@ -17196,7 +19012,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -22419,7 +22258,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17247,36 +19063,45 @@
+@@ -17244,36 +19060,45 @@
        fi
        ;;
  
@@ -22486,7 +22325,7 @@
        ;;
  
      uts4*)
-@@ -17291,15 +19116,10 @@
+@@ -17288,15 +19113,10 @@
      esac
    fi
  
@@ -22504,7 +22343,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17317,8 +19137,8 @@
+@@ -17314,8 +19134,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -22515,7 +22354,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17332,6 +19152,7 @@
+@@ -17329,6 +19149,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -22523,7 +22362,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17354,20 +19175,20 @@
+@@ -17351,20 +19172,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -22549,7 +22388,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17377,7 +19198,20 @@
+@@ -17374,7 +19195,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22571,7 +22410,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17442,7 +19276,7 @@
+@@ -17439,7 +19273,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -22580,7 +22419,7 @@
    ;;
  
  beos*)
-@@ -17451,7 +19285,7 @@
+@@ -17448,7 +19282,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -22589,7 +22428,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17467,7 +19301,7 @@
+@@ -17464,7 +19298,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -22598,7 +22437,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17479,7 +19313,8 @@
+@@ -17476,7 +19310,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -22608,7 +22447,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17509,7 +19344,7 @@
+@@ -17506,7 +19341,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -22617,7 +22456,7 @@
        ;;
      esac
      ;;
-@@ -17532,7 +19367,7 @@
+@@ -17529,7 +19364,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -22626,7 +22465,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17555,20 +19390,17 @@
+@@ -17552,20 +19387,17 @@
    dynamic_linker=no
    ;;
  
@@ -22658,7 +22497,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17586,14 +19418,19 @@
+@@ -17583,14 +19415,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -22680,7 +22519,7 @@
    esac
    ;;
  
-@@ -17613,9 +19450,9 @@
+@@ -17610,9 +19447,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -22692,7 +22531,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17630,7 +19467,7 @@
+@@ -17627,7 +19464,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -22701,7 +22540,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17641,7 +19478,7 @@
+@@ -17638,7 +19475,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -22710,7 +22549,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17653,6 +19490,18 @@
+@@ -17650,6 +19487,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -22729,7 +22568,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17696,29 +19545,26 @@
+@@ -17693,29 +19542,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -22766,7 +22605,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17728,6 +19574,18 @@
+@@ -17725,6 +19571,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -22785,7 +22624,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17737,7 +19595,7 @@
+@@ -17734,7 +19592,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -22794,7 +22633,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17765,8 +19623,13 @@
+@@ -17762,8 +19620,13 @@
  
  openbsd*)
    version_type=sunos
@@ -22809,7 +22648,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17786,7 +19649,7 @@
+@@ -17783,7 +19646,7 @@
  
  os2*)
    libname_spec='$name'
@@ -22818,7 +22657,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17804,13 +19667,6 @@
+@@ -17801,13 +19664,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -22832,7 +22671,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17836,7 +19692,7 @@
+@@ -17833,7 +19689,7 @@
    need_version=yes
    ;;
  
@@ -22841,7 +22680,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17869,27 +19725,55 @@
+@@ -17866,27 +19722,55 @@
    fi
    ;;
  
@@ -22911,7 +22750,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17909,8 +19793,8 @@
+@@ -17906,8 +19790,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -22922,7 +22761,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17921,36 +19805,6 @@
+@@ -17918,36 +19802,6 @@
    enable_fast_install=needless
  fi
  
@@ -22959,7 +22798,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17965,7 +19819,8 @@
+@@ -17962,7 +19816,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -22969,7 +22808,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -18065,6 +19920,12 @@
+@@ -18062,6 +19917,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22982,7 +22821,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18076,6 +19937,9 @@
+@@ -18073,6 +19934,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22992,7 +22831,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18095,7 +19959,7 @@
+@@ -18092,7 +19956,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -23001,7 +22840,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18126,7 +19990,7 @@
+@@ -18123,7 +19987,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -23010,7 +22849,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18141,7 +20005,7 @@
+@@ -18138,7 +20002,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -23019,7 +22858,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18343,7 +20207,10 @@
+@@ -18340,7 +20204,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -23031,7 +22870,7 @@
  fi
  
  
-@@ -18364,7 +20231,6 @@
+@@ -18361,7 +20228,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -23039,7 +22878,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18376,26 +20242,55 @@
+@@ -18373,26 +20239,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -23096,7 +22935,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -18407,8 +20302,8 @@
+@@ -18404,8 +20299,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -23107,7 +22946,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18422,26 +20317,28 @@
+@@ -18419,26 +20314,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -23115,13 +22954,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18428: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20323: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18425: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20320: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18432: \$? = $ac_status" >&5
-+   echo "$as_me:20327: \$? = $ac_status" >&5
+-   echo "$as_me:18429: \$? = $ac_status" >&5
++   echo "$as_me:20324: \$? = $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
@@ -23143,7 +22982,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18455,8 +20352,8 @@
+@@ -18452,8 +20349,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -23154,7 +22993,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18494,6 +20391,11 @@
+@@ -18491,6 +20388,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -23166,7 +23005,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18510,7 +20412,7 @@
+@@ -18507,7 +20409,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -23175,7 +23014,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18536,6 +20438,16 @@
+@@ -18533,6 +20435,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -23192,7 +23031,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18547,7 +20459,7 @@
+@@ -18544,7 +20456,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -23201,7 +23040,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18570,13 +20482,20 @@
+@@ -18567,13 +20479,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -23224,7 +23063,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18591,15 +20510,15 @@
+@@ -18588,15 +20507,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -23246,7 +23085,7 @@
        ;;
  
      sunos4*)
-@@ -18608,7 +20527,7 @@
+@@ -18605,7 +20524,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -23255,7 +23094,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18621,6 +20540,17 @@
+@@ -18618,6 +20537,17 @@
        fi
        ;;
  
@@ -23273,7 +23112,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18632,16 +20562,16 @@
+@@ -18629,16 +20559,16 @@
      esac
    fi
  
@@ -23294,7 +23133,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18655,26 +20585,28 @@
+@@ -18652,26 +20582,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -23302,13 +23141,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18661: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20591: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18658: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20588: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18665: \$? = $ac_status" >&5
-+   echo "$as_me:20595: \$? = $ac_status" >&5
+-   echo "$as_me:18662: \$? = $ac_status" >&5
++   echo "$as_me:20592: \$? = $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
@@ -23330,7 +23169,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18687,7 +20619,7 @@
+@@ -18684,7 +20616,7 @@
  fi
  
  fi
@@ -23339,7 +23178,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18697,8 +20629,50 @@
+@@ -18694,8 +20626,50 @@
      ;;
  esac
  
@@ -23392,7 +23231,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18709,60 +20683,58 @@
+@@ -18706,60 +20680,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -23413,13 +23252,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18728: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20695: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18725: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20692: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18732: \$? = $ac_status" >&5
-+   echo "$as_me:20699: \$? = $ac_status" >&5
+-   echo "$as_me:18729: \$? = $ac_status" >&5
++   echo "$as_me:20696: \$? = $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
@@ -23471,7 +23310,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18772,8 +20744,8 @@
+@@ -18769,8 +20741,8 @@
    need_locks=no
  fi
  
@@ -23482,7 +23321,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18811,6 +20783,16 @@
+@@ -18808,6 +20780,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -23499,7 +23338,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18821,6 +20803,10 @@
+@@ -18818,6 +20800,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -23510,7 +23349,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18831,6 +20817,27 @@
+@@ -18828,6 +20814,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -23538,7 +23377,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18868,7 +20875,7 @@
+@@ -18865,7 +20872,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -23547,7 +23386,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18878,13 +20885,13 @@
+@@ -18875,13 +20882,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -23564,7 +23403,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18893,23 +20900,70 @@
+@@ -18890,23 +20897,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -23641,7 +23480,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18923,13 +20977,40 @@
+@@ -18920,13 +20974,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23684,7 +23523,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18939,24 +21020,19 @@
+@@ -18936,24 +21017,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23716,7 +23555,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18968,7 +21044,7 @@
+@@ -18965,7 +21041,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -23725,7 +23564,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18990,9 +21066,21 @@
+@@ -18987,9 +21063,21 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -23749,7 +23588,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19009,7 +21097,7 @@
+@@ -19006,7 +21094,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -23758,7 +23597,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -19028,8 +21116,12 @@
+@@ -19025,8 +21113,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -23771,7 +23610,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19037,22 +21129,23 @@
+@@ -19034,22 +21126,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -23802,7 +23641,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19068,24 +21161,36 @@
+@@ -19065,24 +21158,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23847,7 +23686,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19099,19 +21204,20 @@
+@@ -19096,19 +21201,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23873,7 +23712,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19130,24 +21236,36 @@
+@@ -19127,24 +21233,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23918,7 +23757,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19161,8 +21279,10 @@
+@@ -19158,8 +21276,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23930,7 +23769,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -19171,13 +21291,11 @@
+@@ -19168,13 +21288,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23947,7 +23786,7 @@
  	fi
        fi
        ;;
-@@ -19190,7 +21308,7 @@
+@@ -19187,7 +21305,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -23956,7 +23795,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19200,68 +21318,68 @@
+@@ -19197,68 +21315,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -24069,7 +23908,7 @@
      fi
        ;;
  
-@@ -19295,8 +21413,8 @@
+@@ -19292,8 +21410,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -24080,7 +23919,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19304,7 +21422,7 @@
+@@ -19301,7 +21419,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -24089,7 +23928,7 @@
        else
  	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -19318,47 +21436,62 @@
+@@ -19315,47 +21433,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -24176,7 +24015,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19372,7 +21505,7 @@
+@@ -19369,7 +21502,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -24185,7 +24024,7 @@
        else
  	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19382,7 +21515,7 @@
+@@ -19379,7 +21512,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -24194,7 +24033,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19405,7 +21538,8 @@
+@@ -19402,7 +21535,8 @@
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -24204,7 +24043,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19415,7 +21549,7 @@
+@@ -19412,7 +21546,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -24213,7 +24052,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19426,14 +21560,14 @@
+@@ -19423,14 +21557,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -24230,7 +24069,7 @@
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
  	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19445,13 +21579,13 @@
+@@ -19442,13 +21576,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -24246,7 +24085,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19459,21 +21593,15 @@
+@@ -19456,21 +21590,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -24272,7 +24111,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19482,8 +21610,18 @@
+@@ -19479,8 +21607,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -24293,7 +24132,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19492,7 +21630,7 @@
+@@ -19489,7 +21627,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -24302,7 +24141,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19540,1513 +21678,746 @@
+@@ -19537,1513 +21675,746 @@
        fi
        ;;
  
@@ -24332,8 +24171,8 @@
        fi
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_GCJ=no
--      ;;
--
+       ;;
+ 
 -    sysv5*)
 -      no_undefined_flag_GCJ=' -z text'
 -      # $CC -shared without GNU ld will not create a library from C++
@@ -24342,8 +24181,22 @@
 -      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
 -      hardcode_libdir_flag_spec_GCJ=
--      hardcode_shlibpath_var_GCJ=no
--      runpath_var='LD_RUN_PATH'
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      no_undefined_flag_GCJ='${wl}-z,text'
++      allow_undefined_flag_GCJ='${wl}-z,nodefs'
++      archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+       runpath_var='LD_RUN_PATH'
 -      ;;
 -
 -    uts4*)
@@ -24351,7 +24204,7 @@
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
--
+ 
 -    *)
 -      ld_shlibs_GCJ=no
 -      ;;
@@ -25387,8 +25240,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+      ;;
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -25430,22 +25282,14 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag_GCJ='${wl}-z,text'
-+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-+      archive_cmds_need_lc_GCJ=no
-+      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator_GCJ=':'
-+      link_all_deplibs_GCJ=yes
-+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -25471,13 +25315,10 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+      if test "$GCC" = yes; then
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
++    uts4*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
 +      ;;
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
@@ -25521,11 +25362,11 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+    uts4*)
-+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_shlibpath_var_GCJ=no
++    *)
++      ld_shlibs_GCJ=no
 +      ;;
++    esac
++  fi
  
 -ac_cv_lib_svld_dlopen=no
 -fi
@@ -25551,11 +25392,9 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    *)
-+      ld_shlibs_GCJ=no
-+      ;;
-+    esac
-+  fi
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
++test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -25585,10 +25424,6 @@
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-+test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+
 +#
 +# Do we need to explicitly link libc?
 +#
@@ -25877,6 +25712,12 @@
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
 +dgux*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -25886,14 +25727,26 @@
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
  
--    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20848 "configure"
+-#include "confdefs.h"
 +freebsd1*)
 +  dynamic_linker=no
 +  ;;
  
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -25938,19 +25791,7 @@
 +  esac
 +  ;;
  
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20851 "configure"
--#include "confdefs.h"
+-#include <stdio.h>
 +gnu*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -25961,8 +25802,14 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
 -#endif
 +hpux9* | hpux10* | hpux11*)
 +  # Give a soname corresponding to the major version so that dld.sl refuses to
@@ -26010,7 +25857,27 @@
 +  postinstall_cmds='chmod 555 $lib'
 +  ;;
  
--#include <stdio.h>
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -26022,7 +25889,10 @@
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
-+
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
 +irix5* | irix6* | nonstopux*)
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
@@ -26060,41 +25930,22 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +# No shared lib support for Linux oldld, aout, or coff.
 +linux*oldld* | linux*aout* | linux*coff*)
 +  dynamic_linker=no
 +  ;;
  
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
 +  version_type=linux
@@ -26110,20 +25961,32 @@
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
  
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
+   fi
+-fi
+-rm -fr conftest*
  
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
 +  # powerpc, because MkLinux only supported shared libraries with the
 +  # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -26133,12 +25996,9 @@
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
  
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -26151,24 +26011,21 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
  
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self=no
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20946 "configure"
+-#include "confdefs.h"
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
@@ -26181,18 +26038,15 @@
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +    soname_spec='${libname}${release}${shared_ext}$major'
 +    dynamic_linker='NetBSD ld.elf_so'
-   fi
--fi
--rm -fr conftest*
--
++  fi
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 +  ;;
  
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
 +newsos6)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -26200,21 +26054,7 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self_static=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20949 "configure"
--#include "confdefs.h"
+-#include <stdio.h>
 +nto-qnx*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -26225,8 +26065,14 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
 -#endif
 +openbsd*)
 +  version_type=sunos
@@ -26254,36 +26100,6 @@
 +  fi
 +  ;;
  
--#include <stdio.h>
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
- 
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
- 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -26305,6 +26121,34 @@
 -#    endif
 -#  endif
 -#endif
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -26318,9 +26162,12 @@
 +  postinstall_cmds='chmod +x $lib'
 +  ;;
  
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +sunos4*)
 +  version_type=sunos
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -26332,12 +26179,7 @@
 +  fi
 +  need_version=yes
 +  ;;
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
++
 +sysv4 | sysv4.3*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -26361,13 +26203,7 @@
 +      ;;
 +  esac
 +  ;;
- 
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
++
 +sysv4*MP*)
 +  if test -d /usr/nec ;then
 +    version_type=linux
@@ -26493,7 +26329,7 @@
  fi
  
  
-@@ -21063,7 +22434,8 @@
+@@ -21060,7 +22431,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -26503,7 +26339,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21163,6 +22535,12 @@
+@@ -21160,6 +22532,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -26516,7 +26352,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21174,6 +22552,9 @@
+@@ -21171,6 +22549,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -26526,7 +26362,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21193,7 +22574,7 @@
+@@ -21190,7 +22571,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -26535,7 +26371,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21224,7 +22605,7 @@
+@@ -21221,7 +22602,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -26544,7 +26380,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21239,7 +22620,7 @@
+@@ -21236,7 +22617,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -26553,7 +26389,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21441,7 +22822,10 @@
+@@ -21438,7 +22819,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -26565,7 +26401,7 @@
  fi
  
  
-@@ -21461,7 +22845,6 @@
+@@ -21458,7 +22842,6 @@
        RC)
  
  
@@ -26573,7 +26409,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21480,15 +22863,42 @@
+@@ -21477,15 +22860,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -26616,7 +26452,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21504,7 +22914,8 @@
+@@ -21501,7 +22911,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -26626,7 +26462,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21604,6 +23015,12 @@
+@@ -21601,6 +23012,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -26639,7 +26475,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21615,6 +23032,9 @@
+@@ -21612,6 +23029,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -26649,7 +26485,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21634,7 +23054,7 @@
+@@ -21631,7 +23051,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -26658,7 +26494,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21665,7 +23085,7 @@
+@@ -21662,7 +23082,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -26667,7 +26503,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21680,7 +23100,7 @@
+@@ -21677,7 +23097,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -26676,7 +26512,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21882,7 +23302,10 @@
+@@ -21879,7 +23299,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -26688,7 +26524,7 @@
  fi
  
  
-@@ -21929,7 +23352,7 @@
+@@ -21926,7 +23349,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -26697,7 +26533,7 @@
  
  # Prevent multiple expansion
  
-@@ -21984,8 +23407,8 @@
+@@ -21981,8 +23404,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -26708,7 +26544,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22011,17 +23434,17 @@
+@@ -22008,17 +23431,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -26732,7 +26568,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22036,32 +23459,33 @@
+@@ -22033,32 +23456,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26774,7 +26610,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22070,8 +23494,8 @@
+@@ -22067,8 +23491,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -26785,7 +26621,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22097,11 +23521,11 @@
+@@ -22094,11 +23518,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -26801,7 +26637,7 @@
  fi
  
  
-@@ -22109,8 +23533,8 @@
+@@ -22106,8 +23530,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -26812,7 +26648,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22120,8 +23544,7 @@
+@@ -22117,8 +23541,7 @@
  
  
  
@@ -26822,7 +26658,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22133,8 +23556,8 @@
+@@ -22130,8 +23553,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -26833,7 +26669,7 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22162,24 +23585,36 @@
+@@ -22159,24 +23582,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26878,7 +26714,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22188,15 +23623,16 @@
+@@ -22185,15 +23620,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26899,7 +26735,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22225,15 +23661,14 @@
+@@ -22222,15 +23658,14 @@
  
  
  
@@ -26918,7 +26754,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22245,9 +23680,6 @@
+@@ -22242,9 +23677,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26928,7 +26764,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22273,24 +23705,36 @@
+@@ -22270,24 +23702,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26973,7 +26809,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22299,9 +23743,10 @@
+@@ -22296,9 +23740,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26986,7 +26822,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22314,11 +23759,11 @@
+@@ -22311,11 +23756,11 @@
  fi
  
  
@@ -27002,7 +26838,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22339,8 +23784,7 @@
+@@ -22336,8 +23781,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -27012,7 +26848,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22378,24 +23822,36 @@
+@@ -22375,24 +23819,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27057,7 +26893,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22405,10 +23861,11 @@
+@@ -22402,10 +23858,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27071,7 +26907,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22421,8 +23878,8 @@
+@@ -22418,8 +23875,8 @@
  
  fi
  
@@ -27082,7 +26918,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22446,15 +23903,14 @@
+@@ -22443,15 +23900,14 @@
  
  
  
@@ -27101,7 +26937,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22466,9 +23922,6 @@
+@@ -22463,9 +23919,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27111,7 +26947,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22493,24 +23946,36 @@
+@@ -22490,24 +23943,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27156,7 +26992,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22519,9 +23984,10 @@
+@@ -22516,9 +23981,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27169,7 +27005,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22534,11 +24000,11 @@
+@@ -22531,11 +23997,11 @@
  fi
  
  
@@ -27185,7 +27021,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22559,8 +24025,7 @@
+@@ -22556,8 +24022,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -27195,7 +27031,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22597,24 +24062,36 @@
+@@ -22594,24 +24059,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27240,7 +27076,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22624,10 +24101,11 @@
+@@ -22621,10 +24098,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27254,7 +27090,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22640,8 +24118,8 @@
+@@ -22637,8 +24115,8 @@
  
  fi
  
@@ -27265,7 +27101,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22664,8 +24142,8 @@
+@@ -22661,8 +24139,8 @@
  
  
  
@@ -27276,7 +27112,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22682,30 +24160,42 @@
+@@ -22679,30 +24157,42 @@
  int
  main ()
  {
@@ -27328,7 +27164,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22714,20 +24204,21 @@
+@@ -22711,20 +24201,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27356,7 +27192,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22744,30 +24235,42 @@
+@@ -22741,30 +24232,42 @@
  int
  main ()
  {
@@ -27408,7 +27244,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22776,21 +24279,22 @@
+@@ -22773,21 +24276,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27437,7 +27273,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22803,40 +24307,52 @@
+@@ -22800,40 +24304,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27502,7 +27338,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22845,19 +24361,20 @@
+@@ -22842,19 +24358,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27529,7 +27365,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22870,40 +24387,52 @@
+@@ -22867,40 +24384,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27594,7 +27430,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22912,14 +24441,15 @@
+@@ -22909,14 +24438,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27614,7 +27450,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -22945,13 +24475,13 @@
+@@ -22942,13 +24472,13 @@
  
     fi
  
@@ -27631,7 +27467,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22980,24 +24510,36 @@
+@@ -22977,24 +24507,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27676,7 +27512,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23009,8 +24551,10 @@
+@@ -23006,8 +24548,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27688,7 +27524,7 @@
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23020,17 +24564,17 @@
+@@ -23017,17 +24561,17 @@
  
  fi
  
@@ -27711,7 +27547,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23059,24 +24603,36 @@
+@@ -23056,24 +24600,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27756,7 +27592,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23088,8 +24644,10 @@
+@@ -23085,8 +24641,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27768,7 +27604,7 @@
           done
           ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23100,8 +24658,8 @@
+@@ -23097,8 +24655,8 @@
  
  fi
  
@@ -27779,7 +27615,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23114,8 +24672,8 @@
+@@ -23111,8 +24669,8 @@
  _ACEOF
  
  
@@ -27790,7 +27626,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23128,40 +24686,52 @@
+@@ -23125,40 +24683,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27855,7 +27691,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23170,21 +24740,22 @@
+@@ -23167,21 +24737,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27884,7 +27720,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23197,40 +24768,52 @@
+@@ -23194,40 +24765,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27949,7 +27785,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23239,21 +24822,22 @@
+@@ -23236,21 +24819,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27978,7 +27814,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23280,53 +24864,59 @@
+@@ -23277,53 +24861,59 @@
  
  #undef inet_ntoa
  
@@ -28057,7 +27893,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23335,17 +24925,18 @@
+@@ -23332,17 +24922,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28082,7 +27918,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23358,40 +24949,52 @@
+@@ -23355,40 +24946,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28147,7 +27983,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23400,21 +25003,22 @@
+@@ -23397,21 +25000,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28176,7 +28012,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23441,53 +25045,59 @@
+@@ -23438,53 +25042,59 @@
  
  #undef connect
  
@@ -28255,7 +28091,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23496,17 +25106,18 @@
+@@ -23493,17 +25103,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28280,7 +28116,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23519,40 +25130,52 @@
+@@ -23516,40 +25127,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28345,7 +28181,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23561,22 +25184,23 @@
+@@ -23558,22 +25181,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28375,7 +28211,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23603,53 +25227,59 @@
+@@ -23600,53 +25224,59 @@
  
  #undef remove
  
@@ -28454,7 +28290,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23658,17 +25288,18 @@
+@@ -23655,17 +25285,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28479,7 +28315,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23681,40 +25312,52 @@
+@@ -23678,40 +25309,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28544,7 +28380,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23723,14 +25366,15 @@
+@@ -23720,14 +25363,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28564,7 +28400,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23738,8 +25382,8 @@
+@@ -23735,8 +25379,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -28575,7 +28411,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23766,53 +25410,59 @@
+@@ -23763,53 +25407,59 @@
  
  #undef shmat
  
@@ -28591,16 +28427,19 @@
 -   builtin and then its argument prototype would still apply.  */
  char shmat ();
  /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
 -#if defined (__stub_shmat) || defined (__stub___shmat)
-+#if defined __stub_shmat || defined __stub___shmat
- choke me
+-choke me
 -#else
 -char (*f) () = shmat;
 -#endif
 -#ifdef __cplusplus
 -}
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_shmat || defined __stub___shmat
++choke me
  #endif
  
  int
@@ -28654,7 +28493,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23821,18 +25471,19 @@
+@@ -23818,18 +25468,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28680,7 +28519,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23845,40 +25496,52 @@
+@@ -23842,40 +25493,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28745,7 +28584,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23887,14 +25550,15 @@
+@@ -23884,14 +25547,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28765,7 +28604,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23908,18 +25572,19 @@
+@@ -23905,18 +25569,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28793,7 +28632,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23930,24 +25595,36 @@
+@@ -23927,24 +25592,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28838,7 +28677,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23956,15 +25633,16 @@
+@@ -23953,15 +25630,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28861,7 +28700,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23973,8 +25651,13 @@
+@@ -23970,8 +25648,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28877,7 +28716,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23998,9 +25681,10 @@
+@@ -23995,9 +25678,10 @@
  
    ac_header_preproc=no
  fi
@@ -28890,7 +28729,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24024,25 +25708,19 @@
+@@ -24021,25 +25705,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -28923,7 +28762,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24060,18 +25738,19 @@
+@@ -24057,18 +25735,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28951,7 +28790,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24082,24 +25761,36 @@
+@@ -24079,24 +25758,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28996,7 +28835,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24108,15 +25799,16 @@
+@@ -24105,15 +25796,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29019,7 +28858,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24125,8 +25817,13 @@
+@@ -24122,8 +25814,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -29035,7 +28874,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24150,9 +25847,10 @@
+@@ -24147,9 +25844,10 @@
  
    ac_header_preproc=no
  fi
@@ -29048,7 +28887,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24176,25 +25874,19 @@
+@@ -24173,25 +25871,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29081,7 +28920,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24208,8 +25900,8 @@
+@@ -24205,8 +25897,8 @@
  
  
     # darwin requires a poll emulation library
@@ -29092,7 +28931,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24222,40 +25914,52 @@
+@@ -24219,40 +25911,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29157,7 +28996,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24264,14 +25968,15 @@
+@@ -24261,14 +25965,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29177,7 +29016,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24282,18 +25987,19 @@
+@@ -24279,18 +25984,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29205,7 +29044,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24304,24 +26010,36 @@
+@@ -24301,24 +26007,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29250,7 +29089,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24330,15 +26048,16 @@
+@@ -24327,15 +26045,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29273,7 +29112,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24347,8 +26066,13 @@
+@@ -24344,8 +26063,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -29289,7 +29128,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24372,9 +26096,10 @@
+@@ -24369,9 +26093,10 @@
  
    ac_header_preproc=no
  fi
@@ -29302,7 +29141,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24398,25 +26123,19 @@
+@@ -24395,25 +26120,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29335,7 +29174,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24431,17 +26150,17 @@
+@@ -24428,17 +26147,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -29359,7 +29198,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24452,24 +26171,36 @@
+@@ -24449,24 +26168,36 @@
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29404,7 +29243,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24478,15 +26209,16 @@
+@@ -24475,15 +26206,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29427,7 +29266,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24495,8 +26227,13 @@
+@@ -24492,8 +26224,13 @@
  /* end confdefs.h.  */
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
@@ -29443,7 +29282,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24520,9 +26257,10 @@
+@@ -24517,9 +26254,10 @@
  
    ac_header_preproc=no
  fi
@@ -29456,7 +29295,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24546,25 +26284,18 @@
+@@ -24543,25 +26281,18 @@
  echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
@@ -29487,7 +29326,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24581,8 +26312,8 @@
+@@ -24578,8 +26309,8 @@
  
  
  
@@ -29498,7 +29337,7 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24608,31 +26339,43 @@
+@@ -24605,31 +26336,43 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29552,7 +29391,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24643,25 +26386,25 @@
+@@ -24640,25 +26383,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29585,7 +29424,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24673,9 +26416,6 @@
+@@ -24670,9 +26413,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29595,7 +29434,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24701,24 +26441,36 @@
+@@ -24698,24 +26438,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29640,7 +29479,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24727,9 +26479,10 @@
+@@ -24724,9 +26476,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29653,7 +29492,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -24742,11 +26495,11 @@
+@@ -24739,11 +26492,11 @@
  fi
  
  
@@ -29669,7 +29508,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24767,8 +26520,7 @@
+@@ -24764,8 +26517,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -29679,7 +29518,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24806,24 +26558,36 @@
+@@ -24803,24 +26555,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29724,7 +29563,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24833,10 +26597,11 @@
+@@ -24830,10 +26594,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29738,7 +29577,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -24849,8 +26614,8 @@
+@@ -24846,8 +26611,8 @@
  
  fi
  
@@ -29749,7 +29588,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24877,8 +26642,8 @@
+@@ -24874,8 +26639,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -29760,7 +29599,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24891,40 +26656,52 @@
+@@ -24888,40 +26653,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29825,7 +29664,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24933,27 +26710,28 @@
+@@ -24930,27 +26707,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29864,7 +29703,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24966,40 +26744,52 @@
+@@ -24963,40 +26741,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29929,7 +29768,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25008,22 +26798,23 @@
+@@ -25005,22 +26795,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29959,7 +29798,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25034,36 +26825,49 @@
+@@ -25031,36 +26822,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30019,7 +29858,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25072,23 +26876,23 @@
+@@ -25069,23 +26873,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30054,7 +29893,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25098,10 +26902,12 @@
+@@ -25095,10 +26899,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30068,7 +29907,7 @@
  test_array [0] = 0
  
    ;
-@@ -25109,24 +26915,36 @@
+@@ -25106,24 +26912,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30113,7 +29952,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25139,10 +26957,12 @@
+@@ -25136,10 +26954,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30127,7 +29966,7 @@
  test_array [0] = 0
  
    ;
-@@ -25150,24 +26970,36 @@
+@@ -25147,24 +26967,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30172,7 +30011,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25176,30 +27008,33 @@
+@@ -25173,30 +27005,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30215,7 +30054,7 @@
  test_array [0] = 0
  
    ;
-@@ -25207,24 +27042,36 @@
+@@ -25204,24 +27039,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30260,7 +30099,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25237,10 +27084,12 @@
+@@ -25234,10 +27081,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30274,7 +30113,7 @@
  test_array [0] = 0
  
    ;
-@@ -25248,24 +27097,36 @@
+@@ -25245,24 +27094,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30319,7 +30158,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25274,24 +27135,27 @@
+@@ -25271,24 +27132,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30357,7 +30196,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25302,10 +27166,12 @@
+@@ -25299,10 +27163,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30371,7 +30210,7 @@
  test_array [0] = 0
  
    ;
-@@ -25313,24 +27179,36 @@
+@@ -25310,24 +27176,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30416,7 +30255,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25339,26 +27217,24 @@
+@@ -25336,26 +27214,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30453,7 +30292,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25366,8 +27242,10 @@
+@@ -25363,8 +27239,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30466,7 +30305,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25376,35 +27254,44 @@
+@@ -25373,35 +27251,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30524,7 +30363,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25415,28 +27302,31 @@
+@@ -25412,28 +27299,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -30548,8 +30387,8 @@
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_int=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
@@ -30568,7 +30407,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25447,36 +27337,49 @@
+@@ -25444,36 +27334,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30628,7 +30467,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25485,23 +27388,23 @@
+@@ -25482,23 +27385,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30663,7 +30502,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25511,10 +27414,12 @@
+@@ -25508,10 +27411,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30677,7 +30516,7 @@
  test_array [0] = 0
  
    ;
-@@ -25522,24 +27427,36 @@
+@@ -25519,24 +27424,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30722,7 +30561,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25552,10 +27469,12 @@
+@@ -25549,10 +27466,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30736,7 +30575,7 @@
  test_array [0] = 0
  
    ;
-@@ -25563,24 +27482,36 @@
+@@ -25560,24 +27479,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30781,7 +30620,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25589,30 +27520,33 @@
+@@ -25586,30 +27517,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30824,7 +30663,7 @@
  test_array [0] = 0
  
    ;
-@@ -25620,24 +27554,36 @@
+@@ -25617,24 +27551,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30869,7 +30708,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25650,10 +27596,12 @@
+@@ -25647,10 +27593,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30883,7 +30722,7 @@
  test_array [0] = 0
  
    ;
-@@ -25661,24 +27609,36 @@
+@@ -25658,24 +27606,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30928,7 +30767,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25687,24 +27647,27 @@
+@@ -25684,24 +27644,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30966,7 +30805,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25715,10 +27678,12 @@
+@@ -25712,10 +27675,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30980,7 +30819,7 @@
  test_array [0] = 0
  
    ;
-@@ -25726,24 +27691,36 @@
+@@ -25723,24 +27688,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31025,7 +30864,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25752,26 +27729,24 @@
+@@ -25749,26 +27726,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31062,7 +30901,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25779,8 +27754,10 @@
+@@ -25776,8 +27751,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31075,7 +30914,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25789,35 +27766,44 @@
+@@ -25786,35 +27763,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31133,7 +30972,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25828,28 +27814,31 @@
+@@ -25825,28 +27811,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -31157,8 +30996,8 @@
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_short=0
--fi
  fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
@@ -31177,7 +31016,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25860,36 +27849,49 @@
+@@ -25857,36 +27846,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31237,7 +31076,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25898,23 +27900,23 @@
+@@ -25895,23 +27897,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31272,7 +31111,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25924,10 +27926,12 @@
+@@ -25921,10 +27923,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31286,7 +31125,7 @@
  test_array [0] = 0
  
    ;
-@@ -25935,24 +27939,36 @@
+@@ -25932,24 +27936,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31331,7 +31170,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25965,10 +27981,12 @@
+@@ -25962,10 +27978,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31345,7 +31184,7 @@
  test_array [0] = 0
  
    ;
-@@ -25976,24 +27994,36 @@
+@@ -25973,24 +27991,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31390,7 +31229,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26002,30 +28032,33 @@
+@@ -25999,30 +28029,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31433,7 +31272,7 @@
  test_array [0] = 0
  
    ;
-@@ -26033,24 +28066,36 @@
+@@ -26030,24 +28063,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31478,7 +31317,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26063,10 +28108,12 @@
+@@ -26060,10 +28105,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31492,7 +31331,7 @@
  test_array [0] = 0
  
    ;
-@@ -26074,24 +28121,36 @@
+@@ -26071,24 +28118,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31537,7 +31376,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26100,24 +28159,27 @@
+@@ -26097,24 +28156,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31575,7 +31414,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26128,10 +28190,12 @@
+@@ -26125,10 +28187,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31589,7 +31428,7 @@
  test_array [0] = 0
  
    ;
-@@ -26139,24 +28203,36 @@
+@@ -26136,24 +28200,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31634,7 +31473,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26165,26 +28241,24 @@
+@@ -26162,26 +28238,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31671,7 +31510,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26192,8 +28266,10 @@
+@@ -26189,8 +28263,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31684,7 +31523,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26202,35 +28278,44 @@
+@@ -26199,35 +28275,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31718,9 +31557,10 @@
    return 0;
  }
  _ACEOF
- rm -f conftest$ac_exeext
+-rm -f conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
++rm -f conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -31742,7 +31582,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26241,28 +28326,31 @@
+@@ -26238,28 +28323,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -31766,8 +31606,8 @@
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_long=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
@@ -31786,7 +31626,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26273,36 +28361,49 @@
+@@ -26270,36 +28358,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31846,7 +31686,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26311,23 +28412,23 @@
+@@ -26308,23 +28409,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31881,7 +31721,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26337,10 +28438,12 @@
+@@ -26334,10 +28435,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31895,7 +31735,7 @@
  test_array [0] = 0
  
    ;
-@@ -26348,24 +28451,36 @@
+@@ -26345,24 +28448,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31940,7 +31780,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26378,10 +28493,12 @@
+@@ -26375,10 +28490,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31954,7 +31794,7 @@
  test_array [0] = 0
  
    ;
-@@ -26389,24 +28506,36 @@
+@@ -26386,24 +28503,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31999,7 +31839,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26415,30 +28544,33 @@
+@@ -26412,30 +28541,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32042,7 +31882,7 @@
  test_array [0] = 0
  
    ;
-@@ -26446,24 +28578,36 @@
+@@ -26443,24 +28575,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32087,7 +31927,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26476,10 +28620,12 @@
+@@ -26473,10 +28617,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32101,7 +31941,7 @@
  test_array [0] = 0
  
    ;
-@@ -26487,24 +28633,36 @@
+@@ -26484,24 +28630,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32146,7 +31986,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26513,24 +28671,27 @@
+@@ -26510,24 +28668,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32184,7 +32024,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26541,10 +28702,12 @@
+@@ -26538,10 +28699,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32198,7 +32038,7 @@
  test_array [0] = 0
  
    ;
-@@ -26552,24 +28715,36 @@
+@@ -26549,24 +28712,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32243,7 +32083,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26578,26 +28753,24 @@
+@@ -26575,26 +28750,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32280,7 +32120,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26605,8 +28778,10 @@
+@@ -26602,8 +28775,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32293,7 +32133,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26615,35 +28790,44 @@
+@@ -26612,35 +28787,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32351,7 +32191,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26654,30 +28838,33 @@
+@@ -26651,30 +28835,33 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -32375,8 +32215,8 @@
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_char_p=0
--fi
  fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
@@ -32397,7 +32237,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26690,40 +28877,52 @@
+@@ -26687,40 +28874,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -32462,7 +32302,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26732,14 +28931,15 @@
+@@ -26729,14 +28928,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32482,7 +32322,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26748,8 +28948,8 @@
+@@ -26745,8 +28945,8 @@
  fi
  
  
@@ -32493,7 +32333,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26762,40 +28962,52 @@
+@@ -26759,40 +28959,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -32558,7 +32398,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26804,14 +29016,15 @@
+@@ -26801,14 +29013,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32578,7 +32418,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26825,8 +29038,8 @@
+@@ -26822,8 +29035,8 @@
  
  
  
@@ -32589,7 +32429,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26837,36 +29050,49 @@
+@@ -26834,36 +29047,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32649,7 +32489,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26875,23 +29101,23 @@
+@@ -26872,23 +29098,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32684,7 +32524,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26901,10 +29127,12 @@
+@@ -26898,10 +29124,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32698,7 +32538,7 @@
  test_array [0] = 0
  
    ;
-@@ -26912,24 +29140,36 @@
+@@ -26909,24 +29137,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32743,7 +32583,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26942,10 +29182,12 @@
+@@ -26939,10 +29179,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32757,7 +32597,7 @@
  test_array [0] = 0
  
    ;
-@@ -26953,24 +29195,36 @@
+@@ -26950,24 +29192,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32802,7 +32642,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26979,30 +29233,33 @@
+@@ -26976,30 +29230,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32845,7 +32685,7 @@
  test_array [0] = 0
  
    ;
-@@ -27010,24 +29267,36 @@
+@@ -27007,24 +29264,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32890,7 +32730,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27040,10 +29309,12 @@
+@@ -27037,10 +29306,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32904,7 +32744,7 @@
  test_array [0] = 0
  
    ;
-@@ -27051,24 +29322,36 @@
+@@ -27048,24 +29319,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32949,7 +32789,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27077,24 +29360,27 @@
+@@ -27074,24 +29357,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32987,7 +32827,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27105,10 +29391,12 @@
+@@ -27102,10 +29388,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33001,7 +32841,7 @@
  test_array [0] = 0
  
    ;
-@@ -27116,24 +29404,36 @@
+@@ -27113,24 +29401,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33046,7 +32886,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27142,26 +29442,24 @@
+@@ -27139,26 +29439,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33083,7 +32923,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27169,8 +29467,10 @@
+@@ -27166,8 +29464,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33096,7 +32936,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27179,35 +29479,44 @@
+@@ -27176,35 +29476,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -33154,7 +32994,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27218,29 +29527,32 @@
+@@ -27215,29 +29524,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -33178,8 +33018,8 @@
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_size_t=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
@@ -33199,7 +33039,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27251,36 +29563,49 @@
+@@ -27248,36 +29560,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33259,7 +33099,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27289,23 +29614,23 @@
+@@ -27286,23 +29611,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33294,7 +33134,7 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -27315,10 +29640,12 @@
+@@ -27312,10 +29637,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33308,7 +33148,7 @@
  test_array [0] = 0
  
    ;
-@@ -27326,24 +29653,36 @@
+@@ -27323,24 +29650,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33353,7 +33193,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27356,10 +29695,12 @@
+@@ -27353,10 +29692,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33367,7 +33207,7 @@
  test_array [0] = 0
  
    ;
-@@ -27367,24 +29708,36 @@
+@@ -27364,24 +29705,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33412,7 +33252,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27393,30 +29746,33 @@
+@@ -27390,30 +29743,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33455,7 +33295,7 @@
  test_array [0] = 0
  
    ;
-@@ -27424,24 +29780,36 @@
+@@ -27421,24 +29777,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33500,7 +33340,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27454,10 +29822,12 @@
+@@ -27451,10 +29819,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33514,7 +33354,7 @@
  test_array [0] = 0
  
    ;
-@@ -27465,24 +29835,36 @@
+@@ -27462,24 +29832,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33559,7 +33399,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27491,24 +29873,27 @@
+@@ -27488,24 +29870,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33597,7 +33437,7 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27519,10 +29904,12 @@
+@@ -27516,10 +29901,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33611,7 +33451,7 @@
  test_array [0] = 0
  
    ;
-@@ -27530,24 +29917,36 @@
+@@ -27527,24 +29914,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33656,7 +33496,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27556,26 +29955,24 @@
+@@ -27553,26 +29952,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33693,7 +33533,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27583,8 +29980,10 @@
+@@ -27580,8 +29977,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33706,7 +33546,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27593,35 +29992,44 @@
+@@ -27590,35 +29989,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -33764,7 +33604,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27632,30 +30040,33 @@
+@@ -27629,30 +30037,33 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -33788,8 +33628,8 @@
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_unsigned_long=0
--fi
  fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
@@ -33810,7 +33650,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27676,36 +30087,48 @@
+@@ -27673,36 +30084,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33871,17 +33711,17 @@
        { { echo "$as_me:$LINENO: error:
         Apparently on your system our assumption sizeof size_t == sizeof unsigned long
         does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27717,18 +30140,18 @@
+@@ -27714,18 +30137,18 @@
     { (exit 1); exit 1; }; }
  
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
- 
 -  echo "$as_me:$LINENO: checking for PIE support" >&5
 -echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++
 +  { echo "$as_me:$LINENO: checking for PIE support" >&5
 +echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
  if test "${kde_cv_val_pie_support+set}" = set; then
@@ -33895,7 +33735,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27758,24 +30181,36 @@
+@@ -27755,24 +30178,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33940,7 +33780,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27784,9 +30219,10 @@
+@@ -27781,9 +30216,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33953,7 +33793,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
      CXXFLAGS=$safe_CXXFLAGS
-@@ -27799,26 +30235,26 @@
+@@ -27796,26 +30232,26 @@
  
  
  fi
@@ -33990,7 +33830,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27837,18 +30273,19 @@
+@@ -27834,18 +30270,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34018,7 +33858,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27859,24 +30296,36 @@
+@@ -27856,24 +30293,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34063,7 +33903,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27885,15 +30334,16 @@
+@@ -27882,15 +30331,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34086,7 +33926,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27902,8 +30352,13 @@
+@@ -27899,8 +30349,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -34102,7 +33942,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -27927,9 +30382,10 @@
+@@ -27924,9 +30379,10 @@
  
    ac_header_preproc=no
  fi
@@ -34115,7 +33955,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27953,25 +30409,19 @@
+@@ -27950,25 +30406,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34148,7 +33988,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27983,8 +30433,8 @@
+@@ -27980,8 +30430,8 @@
  
  done
  
@@ -34159,7 +33999,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28011,53 +30461,59 @@
+@@ -28008,53 +30458,59 @@
  
  #undef _NSGetEnviron
  
@@ -34178,14 +34018,13 @@
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
 -#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
--choke me
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
+ choke me
 -#else
 -char (*f) () = _NSGetEnviron;
 -#endif
 -#ifdef __cplusplus
 -}
-+#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
-+choke me
  #endif
  
  int
@@ -34239,7 +34078,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28066,13 +30522,14 @@
+@@ -28063,13 +30519,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34258,7 +34097,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28093,9 +30550,9 @@
+@@ -28090,9 +30547,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34271,7 +34110,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28121,53 +30578,59 @@
+@@ -28118,53 +30575,59 @@
  
  #undef $ac_func
  
@@ -34350,7 +34189,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28176,13 +30639,15 @@
+@@ -28173,13 +30636,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34370,7 +34209,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28199,32 +30664,32 @@
+@@ -28196,32 +30661,32 @@
  
  
  
@@ -34415,7 +34254,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28240,8 +30705,8 @@
+@@ -28237,8 +30702,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -34426,7 +34265,7 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28278,8 +30743,13 @@
+@@ -28275,8 +30740,13 @@
  /* end confdefs.h.  */
  #include <$x_direct_test_include>
  _ACEOF
@@ -34442,7 +34281,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28346,6 +30816,7 @@
+@@ -28343,6 +30813,7 @@
      fi
    done
  fi
@@ -34450,7 +34289,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28375,24 +30846,36 @@
+@@ -28372,24 +30843,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34495,7 +34334,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28403,7 +30886,7 @@
+@@ -28400,7 +30883,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34504,7 +34343,7 @@
  # First see if replacing the include by lib works.
  # Check X11 before X11Rn because it is often a symlink to the current release.
  for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28451,7 +30934,8 @@
+@@ -28448,7 +30931,8 @@
    done
  done
  fi
@@ -34514,7 +34353,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
  
-@@ -28461,21 +30945,26 @@
+@@ -28458,21 +30942,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -34549,7 +34388,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28483,7 +30972,7 @@
+@@ -28480,7 +30969,7 @@
      # bogus both because they are the default anyway, and because
      # using them would break gcc on systems where it needs fixed includes.
      case $ac_im_incroot in
@@ -34558,7 +34397,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28492,7 +30981,7 @@
+@@ -28489,7 +30978,7 @@
      esac
    fi
    cd ..
@@ -34567,7 +34406,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28536,12 +31025,12 @@
+@@ -28533,12 +31022,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -34584,7 +34423,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28569,8 +31058,8 @@
+@@ -28566,8 +31055,8 @@
  # These have to be linked with before -lX11, unlike the other
  # libraries we check for below, so use a different variable.
  #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
@@ -34595,7 +34434,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28583,40 +31072,52 @@
+@@ -28580,40 +31069,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34660,7 +34499,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28625,14 +31126,15 @@
+@@ -28622,14 +31123,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34680,7 +34519,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28641,8 +31143,8 @@
+@@ -28638,8 +31140,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -34691,7 +34530,7 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28676,24 +31178,36 @@
+@@ -28673,24 +31175,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34736,7 +34575,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28702,10 +31216,11 @@
+@@ -28699,10 +31213,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34750,7 +34589,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
  LDFLAGS=$kde_ldflags_safe
-@@ -28714,8 +31229,8 @@
+@@ -28711,8 +31226,8 @@
  fi
  
  
@@ -34761,7 +34600,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28861,8 +31376,8 @@
+@@ -28858,8 +31373,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -34772,7 +34611,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28873,9 +31388,9 @@
+@@ -28870,9 +31385,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -34785,7 +34624,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28887,40 +31402,52 @@
+@@ -28884,40 +31399,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34850,7 +34689,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28929,14 +31456,16 @@
+@@ -28926,14 +31453,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34871,7 +34710,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28949,8 +31478,8 @@
+@@ -28946,8 +31475,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -34882,7 +34721,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28963,40 +31492,52 @@
+@@ -28960,40 +31489,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34947,7 +34786,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29005,14 +31546,15 @@
+@@ -29002,14 +31543,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34967,7 +34806,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29020,8 +31562,8 @@
+@@ -29017,8 +31559,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -34978,7 +34817,7 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29040,40 +31582,53 @@
+@@ -29037,40 +31579,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35045,7 +34884,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
    fi
-@@ -29088,16 +31643,15 @@
+@@ -29085,16 +31640,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -35066,7 +34905,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29124,24 +31678,36 @@
+@@ -29121,24 +31675,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35111,7 +34950,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29150,8 +31716,10 @@
+@@ -29147,8 +31713,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35123,7 +34962,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29164,13 +31732,13 @@
+@@ -29161,13 +31729,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35141,7 +34980,7 @@
   :
  
  fi
-@@ -29182,16 +31750,15 @@
+@@ -29179,16 +31747,15 @@
      case $host_os in
   	solaris*)
  
@@ -35162,7 +35001,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29218,24 +31785,36 @@
+@@ -29215,24 +31782,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35207,7 +35046,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29244,8 +31823,10 @@
+@@ -29241,8 +31820,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35219,7 +35058,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29258,13 +31839,13 @@
+@@ -29255,13 +31836,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35237,7 +35076,7 @@
   :
  
  fi
-@@ -29291,17 +31872,17 @@
+@@ -29288,17 +31869,17 @@
  
  
  
@@ -35261,7 +35100,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29319,21 +31900,21 @@
+@@ -29316,21 +31897,21 @@
  fi
  
  
@@ -35291,7 +35130,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29352,14 +31933,14 @@
+@@ -29349,14 +31930,14 @@
  
  
  
@@ -35310,7 +35149,7 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29393,24 +31974,36 @@
+@@ -29390,24 +31971,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35355,7 +35194,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29419,9 +32012,10 @@
+@@ -29416,9 +32009,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35368,7 +35207,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29434,8 +32028,8 @@
+@@ -29431,8 +32025,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -35379,7 +35218,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29455,8 +32049,8 @@
+@@ -29452,8 +32046,8 @@
  
  
  
@@ -35390,7 +35229,7 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29492,24 +32086,36 @@
+@@ -29489,24 +32083,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35435,7 +35274,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29518,10 +32124,11 @@
+@@ -29515,10 +32121,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35449,7 +35288,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29535,19 +32142,19 @@
+@@ -29532,19 +32139,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -35475,7 +35314,7 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29580,24 +32187,36 @@
+@@ -29577,24 +32184,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35520,7 +35359,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29606,9 +32225,10 @@
+@@ -29603,9 +32222,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35533,7 +35372,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29618,14 +32238,14 @@
+@@ -29615,14 +32235,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -35554,7 +35393,7 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29658,24 +32278,36 @@
+@@ -29655,24 +32275,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35599,7 +35438,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29684,9 +32316,10 @@
+@@ -29681,9 +32313,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35612,7 +35451,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29696,11 +32329,11 @@
+@@ -29693,11 +32326,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -35628,16 +35467,16 @@
  
         LIBJPEG=
  
-@@ -29720,7 +32353,7 @@
+@@ -29717,7 +32350,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29723: $i/$j" >&5
-+    echo "configure: 32356: $i/$j" >&5
+-    echo "configure: 29720: $i/$j" >&5
++    echo "configure: 32353: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29767,14 +32400,14 @@
+@@ -29764,14 +32397,14 @@
  
  
  
@@ -35655,7 +35494,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29817,8 +32450,8 @@
+@@ -29814,8 +32447,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35666,7 +35505,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29827,8 +32460,8 @@
+@@ -29824,8 +32457,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35677,7 +35516,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29842,10 +32475,9 @@
+@@ -29839,10 +32472,9 @@
  
  
  
@@ -35690,7 +35529,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29855,7 +32487,8 @@
+@@ -29852,7 +32484,8 @@
      fi
  
  
@@ -35700,7 +35539,7 @@
  
  USING_QT_MT=""
  
-@@ -29875,13 +32508,13 @@
+@@ -29872,13 +32505,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -35718,7 +35557,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29953,8 +32586,8 @@
+@@ -29950,8 +32583,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -35729,7 +35568,7 @@
  
  if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
  LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29963,34 +32596,34 @@
+@@ -29960,34 +32593,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -35744,14 +35583,14 @@
  
 -fi;
 +fi
++
  
  
 -# Check whether --with-qt-includes or --without-qt-includes was given.
--if test "${with_qt_includes+set}" = set; then
--  withval="$with_qt_includes"
- 
 +# Check whether --with-qt-includes was given.
-+if test "${with_qt_includes+set}" = set; then
+ if test "${with_qt_includes+set}" = set; then
+-  withval="$with_qt_includes"
+-
 +  withval=$with_qt_includes;
         ac_qt_includes="$withval"
  
@@ -35776,16 +35615,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30018,7 +32651,7 @@
+@@ -30015,7 +32648,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 30021: $i/$j" >&5
-+    echo "configure: 32654: $i/$j" >&5
+-    echo "configure: 30018: $i/$j" >&5
++    echo "configure: 32651: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30055,8 +32688,7 @@
+@@ -30052,8 +32685,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -35795,7 +35634,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30193,13 +32825,13 @@
+@@ -30190,13 +32822,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -35813,7 +35652,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30208,15 +32840,14 @@
+@@ -30205,15 +32837,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -35832,7 +35671,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30337,12 +32968,12 @@
+@@ -30334,12 +32965,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -35849,7 +35688,7 @@
  
  fi
  
-@@ -30380,14 +33011,14 @@
+@@ -30377,14 +33008,14 @@
     fi
  
  
@@ -35867,7 +35706,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30430,8 +33061,8 @@
+@@ -30427,8 +33058,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35878,7 +35717,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30452,22 +33083,22 @@
+@@ -30449,22 +33080,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35906,7 +35745,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30510,12 +33141,12 @@
+@@ -30507,12 +33138,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35923,7 +35762,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30545,10 +33176,10 @@
+@@ -30542,10 +33173,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -35937,7 +35776,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30571,22 +33202,22 @@
+@@ -30568,22 +33199,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35967,7 +35806,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30609,13 +33240,13 @@
+@@ -30606,13 +33237,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35985,7 +35824,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30646,15 +33277,14 @@
+@@ -30643,15 +33274,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -36004,7 +35843,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30687,24 +33317,36 @@
+@@ -30684,24 +33314,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36049,7 +35888,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -30713,9 +33355,10 @@
+@@ -30710,9 +33352,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36062,7 +35901,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30731,12 +33374,12 @@
+@@ -30728,12 +33371,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -36079,7 +35918,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30767,15 +33410,15 @@
+@@ -30764,15 +33407,15 @@
  
  
  
@@ -36101,7 +35940,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30799,11 +33442,11 @@
+@@ -30796,11 +33439,11 @@
  
  
  
@@ -36117,34 +35956,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30855,7 +33498,7 @@
+@@ -30852,7 +33495,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30858: $i/$j" >&5
-+    echo "configure: 33501: $i/$j" >&5
+-    echo "configure: 30855: $i/$j" >&5
++    echo "configure: 33498: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30885,7 +33528,7 @@
+@@ -30882,7 +33525,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30888: $i/$j" >&5
-+    echo "configure: 33531: $i/$j" >&5
+-    echo "configure: 30885: $i/$j" >&5
++    echo "configure: 33528: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30903,7 +33546,7 @@
+@@ -30900,7 +33543,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30906: $i/$j" >&5
-+    echo "configure: 33549: $i/$j" >&5
+-    echo "configure: 30903: $i/$j" >&5
++    echo "configure: 33546: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30962,12 +33605,12 @@
+@@ -30959,12 +33602,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -36161,7 +36000,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30976,8 +33619,8 @@
+@@ -30973,8 +33616,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -36172,7 +36011,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -31015,8 +33658,8 @@
+@@ -31012,8 +33655,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -36183,7 +36022,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31059,8 +33702,8 @@
+@@ -31056,8 +33699,8 @@
  fi
  
  
@@ -36194,7 +36033,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31092,10 +33735,9 @@
+@@ -31089,10 +33732,9 @@
  
  
  
@@ -36207,7 +36046,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31109,13 +33751,14 @@
+@@ -31106,13 +33748,14 @@
    fi
  
  
@@ -36225,28 +36064,28 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31226,15 +33869,14 @@
+@@ -31223,15 +33866,14 @@
  else
  
    if test $kde_qtver = 1; then
 -     echo "$as_me:$LINENO: result: compiling" >&5
 -echo "${ECHO_T}compiling" >&6
+-
 +     { echo "$as_me:$LINENO: result: compiling" >&5
 +echo "${ECHO_T}compiling" >&6; }
  
- 
 -    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+ 
 +    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
  
--
 -     ac_ext=cc
 +     ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31286,8 +33928,8 @@
+@@ -31283,8 +33925,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -36257,7 +36096,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31326,8 +33968,8 @@
+@@ -31323,8 +33965,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -36268,7 +36107,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31335,8 +33977,8 @@
+@@ -31332,8 +33974,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -36279,28 +36118,28 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31529,15 +34171,14 @@
+@@ -31526,15 +34168,14 @@
  else
  
    if test $kde_qtver = 1; then
 -     echo "$as_me:$LINENO: result: compiling" >&5
 -echo "${ECHO_T}compiling" >&6
--
 +     { echo "$as_me:$LINENO: result: compiling" >&5
 +echo "${ECHO_T}compiling" >&6; }
  
+ 
 -    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
- 
 +    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
  
+-
 -     ac_ext=cc
 +     ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31589,8 +34230,8 @@
+@@ -31586,8 +34227,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -36311,7 +36150,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31629,8 +34270,8 @@
+@@ -31626,8 +34267,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -36322,7 +36161,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31638,8 +34279,8 @@
+@@ -31635,8 +34276,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -36333,7 +36172,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31731,22 +34372,22 @@
+@@ -31728,22 +34369,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -36362,7 +36201,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31779,14 +34420,14 @@
+@@ -31776,14 +34417,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -36380,7 +36219,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31829,8 +34470,8 @@
+@@ -31826,8 +34467,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36391,7 +36230,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31841,21 +34482,21 @@
+@@ -31838,21 +34479,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36418,7 +36257,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31898,8 +34539,8 @@
+@@ -31895,8 +34536,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36429,7 +36268,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31910,22 +34551,22 @@
+@@ -31907,22 +34548,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36457,7 +36296,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31968,8 +34609,8 @@
+@@ -31965,8 +34606,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36468,7 +36307,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -31982,21 +34623,21 @@
+@@ -31979,21 +34620,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36495,7 +36334,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32039,8 +34680,8 @@
+@@ -32036,8 +34677,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36506,7 +36345,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32053,22 +34694,22 @@
+@@ -32050,22 +34691,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36534,7 +36373,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32111,12 +34752,12 @@
+@@ -32108,12 +34749,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36551,7 +36390,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32145,14 +34786,14 @@
+@@ -32142,14 +34783,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -36569,7 +36408,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32195,8 +34836,8 @@
+@@ -32192,8 +34833,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36580,7 +36419,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32207,21 +34848,21 @@
+@@ -32204,21 +34845,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36607,7 +36446,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32264,8 +34905,8 @@
+@@ -32261,8 +34902,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36618,7 +36457,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32276,8 +34917,8 @@
+@@ -32273,8 +34914,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36629,7 +36468,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32285,14 +34926,14 @@
+@@ -32282,14 +34923,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -36647,7 +36486,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32335,8 +34976,8 @@
+@@ -32332,8 +34973,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36658,7 +36497,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32347,8 +34988,8 @@
+@@ -32344,8 +34985,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36669,7 +36508,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32356,14 +34997,14 @@
+@@ -32353,14 +34994,14 @@
  
          fi
  
@@ -36687,7 +36526,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32406,12 +35047,12 @@
+@@ -32403,12 +35044,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36704,245 +36543,77 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32426,7 +35067,7 @@
+@@ -32423,7 +35064,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32429: $i/$j" >&5
-+    echo "configure: 35070: $i/$j" >&5
+-    echo "configure: 32426: $i/$j" >&5
++    echo "configure: 35067: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32449,207 +35090,772 @@
+@@ -32584,13 +35225,12 @@
  
  
  
--        fi
-+        fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+kdeinitdir='$(kde_moduledir)'
-+
-+
-+
-+if test "$kde_qtver" = 1; then
-+  kde_minidir="$kde_icondir/mini"
-+else
-+# for KDE 1 - this breaks KDE2 apps using minidir, but
-+# that's the plan ;-/
-+  kde_minidir="/dev/null"
-+fi
-+
-+
-+
-+
-+
-+
-+if test $kde_qtver = 3; then
-+   case $host in
-+               *cygwin*) lib_kded="-lkdeinit_kded" ;;
-+               *) lib_kded="" ;;
-+       esac
-+   LIB_KDED=$lib_kded
-+
-+   LIB_KDECORE="-lkdecore"
-+
-+   LIB_KDEUI="-lkdeui"
-+
-+   LIB_KIO="-lkio"
-+
-+   LIB_KJS="-lkjs"
-+
-+   LIB_SMB="-lsmb"
-+
-+   LIB_KAB="-lkab"
-+
-+   LIB_KABC="-lkabc"
-+
-+   LIB_KHTML="-lkhtml"
-+
-+   LIB_KSPELL="-lkspell"
-+
-+   LIB_KPARTS="-lkparts"
-+
-+   LIB_KDEPRINT="-lkdeprint"
-+
-+   LIB_KUTILS="-lkutils"
-+
-+   LIB_KDEPIM="-lkdepim"
-+
-+   LIB_KIMPROXY="-lkimproxy"
-+
-+   LIB_KNEWSTUFF="-lknewstuff"
-+
-+   LIB_KDNSSD="-lkdnssd"
-+
-+   LIB_KUNITTEST="-lkunittest"
-+
-+# these are for backward compatibility
-+   LIB_KSYCOCA="-lkio"
-+
-+   LIB_KFILE="-lkio"
-+
-+elif test $kde_qtver = 2; then
-+   LIB_KDECORE="-lkdecore"
-+
-+   LIB_KDEUI="-lkdeui"
-+
-+   LIB_KIO="-lkio"
-+
-+   LIB_KSYCOCA="-lksycoca"
-+
-+   LIB_SMB="-lsmb"
-+
-+   LIB_KFILE="-lkfile"
-+
-+   LIB_KAB="-lkab"
-+
-+   LIB_KHTML="-lkhtml"
-+
-+   LIB_KSPELL="-lkspell"
-+
-+   LIB_KPARTS="-lkparts"
-+
-+   LIB_KDEPRINT="-lkdeprint"
-+
-+else
-+   LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
-+
-+   LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
-+
-+   LIB_KFM="-lkfm $(LIB_KDECORE)"
-+
-+   LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
-+
-+   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
-+
-+fi
- 
- 
- 
-+#MIN_CONFIG
- 
- 
- 
- 
+-  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
 +echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
  
-+  if test "x$GXX" = "xyes"; then
+   if test "x$GXX" = "xyes"; then
  
+-
+-     ac_ext=cc
 +     ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 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'
+@@ -32611,13 +35251,13 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "GCC visibility push" >/dev/null 2>&1; then
  
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- 
- 
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+ #include <exception>
- 
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "GCC visibility push" >/dev/null 2>&1; then
- 
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +      { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+      kde_stdc_visibility_patched=yes
-+else
+       kde_stdc_visibility_patched=yes
+ else
  
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +      { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+      { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
-+                   visibility support. Disabling -fvisibility=hidden" >&5
-+echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-+                   visibility support. Disabling -fvisibility=hidden" >&2;}
+       { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+                    visibility support. Disabling -fvisibility=hidden" >&5
+ echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+@@ -32637,16 +35277,15 @@
  
-+      kde_stdc_visibility_patched=no
-+fi
-+rm -f conftest*
+     kde_have_gcc_visibility=no
  
- 
-+    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
- 
- 
-+    kde_have_gcc_visibility=no
- 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
 +echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
-+kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+ kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
  
  
+-
+-   ac_ext=cc
 +   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- 
- 
-+  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
+ 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'
+@@ -32673,24 +35312,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -36950,12 +36621,16 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -36963,112 +36638,77 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "kde_cv_prog_cxx_$kde_cache=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32699,8 +35350,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
- 
-+fi
- 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+  CXXFLAGS="$save_CXXFLAGS"
-+  ac_ext=c
-+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
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+   ac_ext=c
+@@ -32713,28 +35366,27 @@
+ fi
  
--kdeinitdir='$(kde_moduledir)'
- 
-+fi
- 
-+if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 + { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+ :
+  :
  
--if test "$kde_qtver" = 1; then
--  kde_minidir="$kde_icondir/mini"
-+      kde_have_gcc_visibility=yes
+       kde_have_gcc_visibility=yes
+-                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
 +                              # Check whether --enable-gcc-hidden-visibility was given.
-+if test "${enable_gcc_hidden_visibility+set}" = set; then
+ if test "${enable_gcc_hidden_visibility+set}" = set; then
+-  enableval="$enable_gcc_hidden_visibility"
+-  kde_have_gcc_visibility=$enableval
 +  enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
  else
--# for KDE 1 - this breaks KDE2 apps using minidir, but
--# that's the plan ;-/
--  kde_minidir="/dev/null"
-+  kde_have_gcc_visibility=no
- fi
+   kde_have_gcc_visibility=no
+-fi;
++fi
  
- 
+-      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
++
 +      { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
 +echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
-+if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
  
  
+-
+-           ac_ext=cc
 +           ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+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'
- 
--if test $kde_qtver = 3; then
--   case $host in
--               *cygwin*) lib_kded="-lkdeinit_kded" ;;
--               *) lib_kded="" ;;
--       esac
--   LIB_KDED=$lib_kded
- 
--   LIB_KDECORE="-lkdecore"
- 
--   LIB_KDEUI="-lkdeui"
-+          safe_CXXFLAGS=$CXXFLAGS
-+          CXXFLAGS="$CXXFLAGS $all_includes"
- 
--   LIB_KIO="-lkio"
-+          cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--   LIB_KJS="-lkjs"
-+#include <qglobal.h>
-+#if Q_EXPORT - 0 != 0
-+/* if this compiles, then Q_EXPORT is undefined */
-+/* if Q_EXPORT is nonempty, this will break compilation */
-+#endif
- 
--   LIB_SMB="-lsmb"
-+int
-+main ()
-+{
-+/* elvis is alive */
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
+ 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'
+@@ -32769,24 +35421,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37076,12 +36716,16 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37089,111 +36733,67 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_val_qt_gcc_visibility_patched=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32795,9 +35459,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
--   LIB_KAB="-lkab"
+-kde_cv_val_qt_gcc_visibility_patched=yes
 +	kde_cv_val_qt_gcc_visibility_patched=yes
-+fi
- 
--   LIB_KABC="-lkabc"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--   LIB_KHTML="-lkhtml"
-+          CXXFLAGS=$safe_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
+           CXXFLAGS=$safe_CXXFLAGS
+           ac_ext=c
+@@ -32809,21 +35474,20 @@
  
--   LIB_KSPELL="-lkspell"
  
--   LIB_KPARTS="-lkparts"
- 
--   LIB_KDEPRINT="-lkdeprint"
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
 +echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
  
--   LIB_KUTILS="-lkutils"
-+      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
  
--   LIB_KDEPIM="-lkdepim"
+-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
 +    { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
 +echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
-+if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
  
--   LIB_KIMPROXY="-lkimproxy"
  
--   LIB_KNEWSTUFF="-lknewstuff"
+-
+-         ac_ext=cc
 +         ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--   LIB_KDNSSD="-lkdnssd"
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- 
--   LIB_KUNITTEST="-lkunittest"
- 
--# these are for backward compatibility
--   LIB_KSYCOCA="-lkio"
- 
--   LIB_KFILE="-lkio"
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
- 
--elif test $kde_qtver = 2; then
--   LIB_KDECORE="-lkdecore"
-+        cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
- 
--   LIB_KDEUI="-lkdeui"
-+          /* 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;
-+          }
- 
--   LIB_KIO="-lkio"
-+int
-+main ()
-+{
-+/* elvis is alive */
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ 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'
+@@ -32863,24 +35527,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37201,12 +36801,16 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37214,129 +36818,120 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_cv_val_gcc_visibility_bug=no
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32889,9 +35565,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_gcc_visibility_bug=yes
 +	kde_cv_val_gcc_visibility_bug=yes
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+
-+        CXXFLAGS=$safe_CXXFLAGS
-+        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
+       conftest$ac_exeext conftest.$ac_ext
  
--   LIB_KSYCOCA="-lksycoca"
+         CXXFLAGS=$safe_CXXFLAGS
+@@ -32905,8 +35582,8 @@
  
--   LIB_SMB="-lsmb"
  
--   LIB_KFILE="-lkfile"
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
 +{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
 +echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
  
--   LIB_KAB="-lkab"
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
+     if test x$kde_cv_val_gcc_visibility_bug = xno; then
+       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+@@ -32922,8 +35599,8 @@
+       fi
  
--   LIB_KHTML="-lkhtml"
- 
--   LIB_KSPELL="-lkspell"
-+        HAVE_GCC_VISIBILITY=1
- 
--   LIB_KPARTS="-lkparts"
-+cat >>confdefs.h <<_ACEOF
-+#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
-+_ACEOF
- 
--   LIB_KDEPRINT="-lkdeprint"
-+      fi
- 
  else
--   LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
--
--   LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 + { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+ :
+  :
  
--   LIB_KFM="-lkfm $(LIB_KDECORE)"
-+fi
- 
--   LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
-+  fi
- 
--   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
- 
--fi
-+DO_NOT_COMPILE="$DO_NOT_COMPILE kappgen kstartperf"
-+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
- 
-+for ac_prog in flex lex
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ fi
+@@ -32938,8 +35615,8 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_LEX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$LEX"; then
-+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
+ if test "${ac_cv_prog_LEX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32952,236 +35629,196 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_LEX="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+     ac_cv_prog_LEX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
  
-+fi
-+fi
-+LEX=$ac_cv_prog_LEX
-+if test -n "$LEX"; then
+ fi
+ fi
+ LEX=$ac_cv_prog_LEX
+ if test -n "$LEX"; then
+-  echo "$as_me:$LINENO: result: $LEX" >&5
+-echo "${ECHO_T}$LEX" >&6
 +  { echo "$as_me:$LINENO: result: $LEX" >&5
 +echo "${ECHO_T}$LEX" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
  
--#MIN_CONFIG
++
+   test -n "$LEX" && break
+ done
+ test -n "$LEX" || LEX=":"
  
-+  test -n "$LEX" && break
-+done
-+test -n "$LEX" || LEX=":"
- 
+-if test -z "$LEXLIB"
+-then
+-  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
+-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
+-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
 +if test "x$LEX" != "x:"; then
 +  cat >conftest.l <<_ACEOF
 +%%
@@ -37350,13 +36945,39 @@
 +%%
 +#ifdef YYTEXT_POINTER
 +extern char *yytext;
-+#endif
-+int
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char yywrap ();
+ int
+-main ()
 +main (void)
-+{
+ {
+-yywrap ();
+-  ;
+-  return 0;
 +  return ! yylex () + ! yywrap ();
-+}
-+_ACEOF
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +{ (ac_try="$LEX conftest.l"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37364,15 +36985,20 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$LEX conftest.l") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_fl_yywrap=yes
 +  (exit $ac_status); }
 +{ echo "$as_me:$LINENO: checking lex output file root" >&5
 +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_lex_root+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
  
+-ac_cv_lib_fl_yywrap=no
 +if test -f lex.yy.c; then
 +  ac_cv_prog_lex_root=lex.yy
 +elif test -f lexyy.c; then
@@ -37381,30 +37007,62 @@
 +  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
 +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
+-if test $ac_cv_lib_fl_yywrap = yes; then
+-  LEXLIB="-lfl"
+-else
+-  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
+-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
+-if test "${ac_cv_lib_l_yywrap+set}" = set; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
 +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
 +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
- 
--  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
--echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
++
 +if test -z "${LEXLIB+set}"; then
 +  { echo "$as_me:$LINENO: checking lex library" >&5
 +echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_lex+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ll  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
--  if test "x$GXX" = "xyes"; then
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char yywrap ();
+-int
+-main ()
+-{
+-yywrap ();
+-  ;
+-  return 0;
+-}
 +    ac_save_LIBS=$LIBS
 +    ac_cv_lib_lex='none needed'
 +    for ac_lib in '' -lfl -ll; do
 +      LIBS="$ac_lib $ac_save_LIBS"
 +      cat >conftest.$ac_ext <<_ACEOF
 +`cat $LEX_OUTPUT_ROOT.c`
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37412,12 +37070,16 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37425,75 +37087,107 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_l_yywrap=yes
 +  ac_cv_lib_lex=$ac_lib
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
+-ac_cv_lib_l_yywrap=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
+-if test $ac_cv_lib_l_yywrap = yes; then
+-  LEXLIB="-ll"
+-fi
  
--     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
-+fi
+ fi
  
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-fi
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +      test "$ac_cv_lib_lex" != 'none needed' && break
 +    done
 +    LIBS=$ac_save_LIBS
  
-+fi
+-if test "x$LEX" != "x:"; then
+-  echo "$as_me:$LINENO: checking lex output file root" >&5
+-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
+-if test "${ac_cv_prog_lex_root+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # The minimal lex program is just a single line: %%.  But some broken lexes
+-# (Solaris, I think it was) want two %% lines, so accommodate them.
+-cat >conftest.l <<_ACEOF
+-%%
+-%%
+-_ACEOF
+-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
+-  (eval $LEX conftest.l) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-if test -f lex.yy.c; then
+-  ac_cv_prog_lex_root=lex.yy
+-elif test -f lexyy.c; then
+-  ac_cv_prog_lex_root=lexyy
+-else
+-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+-   { (exit 1); exit 1; }; }
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
 +echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
 +  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
+-rm -f conftest.l
+-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
  
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-- #include <exception>
- 
+-echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
++
 +{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
 +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # POSIX says lex can declare yytext either as a pointer or an array; the
+ if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # POSIX says lex can declare yytext either as a pointer or an array; the
+-# default is implementation-dependent. Figure out which it is, since
 +# default is implementation-dependent.  Figure out which it is, since
-+# not all implementations provide the %pointer and %array declarations.
-+ac_cv_prog_lex_yytext_pointer=no
-+ac_save_LIBS=$LIBS
+ # not all implementations provide the %pointer and %array declarations.
+ ac_cv_prog_lex_yytext_pointer=no
+-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
+ ac_save_LIBS=$LIBS
+-LIBS="$LIBS $LEXLIB"
 +LIBS="$LEXLIB $ac_save_LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
 +#define YYTEXT_POINTER 1
-+`cat $LEX_OUTPUT_ROOT.c`
+ `cat $LEX_OUTPUT_ROOT.c`
  _ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "GCC visibility push" >/dev/null 2>&1; then
--
--      echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--      kde_stdc_visibility_patched=yes
-+rm -f conftest.$ac_objext conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37501,12 +37195,16 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37514,115 +37212,90 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_lex_yytext_pointer=yes
- else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33190,15 +35827,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
--      echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--      { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
--                   visibility support. Disabling -fvisibility=hidden" >&5
--echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
--                   visibility support. Disabling -fvisibility=hidden" >&2;}
- 
--      kde_stdc_visibility_patched=no
++
  fi
--rm -f conftest*
--
- 
--    ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-rm -f conftest.err conftest.$ac_objext \
++
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_save_LIBS
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_save_LIBS
+-rm -f "${LEX_OUTPUT_ROOT}.c"
  
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
 +echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
-+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+ if test $ac_cv_prog_lex_yytext_pointer = yes; then
  
--    kde_have_gcc_visibility=no
-+cat >>confdefs.h <<\_ACEOF
-+#define YYTEXT_POINTER 1
-+_ACEOF
+ cat >>confdefs.h <<\_ACEOF
+@@ -33206,6 +35844,7 @@
+ _ACEOF
  
--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
-+fi
+ fi
 +rm -f conftest.l $LEX_OUTPUT_ROOT.c
  
-+fi
-+if test "$LEX" = :; then
-+  LEX=${am_missing_run}flex
-+fi
+ fi
+ if test "$LEX" = :; then
+@@ -33213,8 +35852,7 @@
+ fi
  
  
--   ac_ext=cc
+-
+- ac_ext=cc
 + ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32658,335 +35864,325 @@
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+@@ -33224,17 +35862,17 @@
  
  
--  save_CXXFLAGS="$CXXFLAGS"
--  CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--  cat >conftest.$ac_ext <<_ACEOF
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+ if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
+-echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
 +echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
+-echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
 +echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
-+else
-+  # Is the header compilable?
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
+-echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
 +echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--int
--main ()
--{
-- return 0;
--  ;
--  return 0;
--}
-+$ac_includes_default
-+#include <FlexLexer.h>
+@@ -33245,24 +35883,36 @@
+ #include <FlexLexer.h>
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37650,10 +37323,9 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+ 	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -s conftest.$ac_objext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -37663,30 +37335,35 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  eval "kde_cv_prog_cxx_$kde_cache=yes"
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+@@ -33271,15 +35921,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
+-echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
 +echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <FlexLexer.h>
-+_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33288,8 +35939,13 @@
+ /* end confdefs.h.  */
+ #include <FlexLexer.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -37694,301 +37371,142 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -33313,9 +35969,10 @@
  
-+  ac_header_preproc=no
+   ac_header_preproc=no
  fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--  CXXFLAGS="$save_CXXFLAGS"
--  ac_ext=c
 +
-+rm -f conftest.err conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -33339,25 +35996,18 @@
+ echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
 +
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
+-echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
 +echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_FlexLexer_h=$ac_header_preproc
-+fi
+ if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_FlexLexer_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
+-echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
 +echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_FlexLexer_h = yes; then
-+  kde_have_flex=yes
-+else
-+  kde_have_flex=no
-+fi
-+
-+
-+
-+if test "$kde_have_flex" = "no"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE kbabel"
-+fi
-+ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
+ fi
+ if test $ac_cv_header_FlexLexer_h = yes; then
+@@ -33379,19 +36029,19 @@
  
--fi
--
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
  
--      kde_have_gcc_visibility=yes
--                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
--if test "${enable_gcc_hidden_visibility+set}" = set; then
--  enableval="$enable_gcc_hidden_visibility"
--  kde_have_gcc_visibility=$enableval
+ 
+-# Check whether --with-berkeley-db or --without-berkeley-db was given.
 +# Check whether --with-berkeley-db was given.
-+if test "${with_berkeley_db+set}" = set; then
+ if test "${with_berkeley_db+set}" = set; then
+-  withval="$with_berkeley_db"
+-
 +  withval=$with_berkeley_db;
  else
--  kde_have_gcc_visibility=no
+   with_berkeley_db=check
 -fi;
-+  with_berkeley_db=check
 +fi
++
  
--      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
--echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
--if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+ LIB_DBIV=""
+ if test "x$with_berkeley_db" != xno; then
  
-+LIB_DBIV=""
-+if test "x$with_berkeley_db" != xno; then
- 
+-echo "$as_me:$LINENO: checking for Berkeley Database IV" >&5
+-echo $ECHO_N "checking for Berkeley Database IV... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for Berkeley Database IV" >&5
 +echo $ECHO_N "checking for Berkeley Database IV... $ECHO_C" >&6; }
  
--           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
-+db_libraries=""
-+db_includes=""
-+db_name=""
-+ac_db_name="db"
-+ac_db_includes=""
-+ac_db_libraries=""
-+ac_db_include_file="db.h"
+ db_libraries=""
+ db_includes=""
+@@ -33402,41 +36052,41 @@
+ ac_db_include_file="db.h"
  
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
+-# Check whether --with-db-dir or --without-db-dir was given.
 +# Check whether --with-db-dir was given.
-+if test "${with_db_dir+set}" = set; then
+ if test "${with_db_dir+set}" = set; then
+-  withval="$with_db_dir"
+-    ac_db_includes=-I"$withval"/include
 +  withval=$with_db_dir;   ac_db_includes=-I"$withval"/include
-+       ac_db_libraries=-L"$withval"/lib
+        ac_db_libraries=-L"$withval"/lib
  
+-fi;
 +fi
++
  
--          safe_CXXFLAGS=$CXXFLAGS
--          CXXFLAGS="$CXXFLAGS $all_includes"
- 
--          cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+-# Check whether --with-db-include-dir or --without-db-include-dir was given.
 +# Check whether --with-db-include-dir was given.
-+if test "${with_db_include_dir+set}" = set; then
+ if test "${with_db_include_dir+set}" = set; then
+-  withval="$with_db_include_dir"
+-    ac_db_includes=-I"$withval"
 +  withval=$with_db_include_dir;   ac_db_includes=-I"$withval"
- 
--#include <qglobal.h>
--#if Q_EXPORT - 0 != 0
--/* if this compiles, then Q_EXPORT is undefined */
--/* if Q_EXPORT is nonempty, this will break compilation */
--#endif
++
 +fi
  
--int
--main ()
--{
--/* elvis is alive */
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_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_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  kde_cv_val_qt_gcc_visibility_patched=no
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-fi;
  
--kde_cv_val_qt_gcc_visibility_patched=yes
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Check whether --with-db-include or --without-db-include was given.
 +# Check whether --with-db-include was given.
-+if test "${with_db_include+set}" = set; then
+ if test "${with_db_include+set}" = set; then
+-  withval="$with_db_include"
+-    ac_db_include_file=-I"$withval"
 +  withval=$with_db_include;   ac_db_include_file=-I"$withval"
- 
--          CXXFLAGS=$safe_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
  
+-fi;
  
+-# Check whether --with-db-lib-dir or --without-db-lib-dir was given.
 +# Check whether --with-db-lib-dir was given.
-+if test "${with_db_lib_dir+set}" = set; then
+ if test "${with_db_lib_dir+set}" = set; then
+-  withval="$with_db_lib_dir"
+-    ac_db_libraries=-L"$withval"
 +  withval=$with_db_lib_dir;   ac_db_libraries=-L"$withval"
++
++fi
  
- fi
--echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
--echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
+-fi;
  
--      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- 
--    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
--echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
--if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+-# Check whether --with-db-name or --without-db-name was given.
 +# Check whether --with-db-name was given.
-+if test "${with_db_name+set}" = set; then
+ if test "${with_db_name+set}" = set; then
+-  withval="$with_db_name"
+-    ac_db_name="$withval"
 +  withval=$with_db_name;   ac_db_name="$withval"
- 
++
 +fi
  
+-fi;
  
--         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'
  
-+if test "${kde_cv_berk_database+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- 
-+kde_safe_LDFLAGS=$LDFLAGS
-+kde_db_safe_LIBS=$LIBS
-+LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $all_libraries $ac_db_libraries $all_includes $ac_db_includes"
- 
--        safe_CXXFLAGS=$CXXFLAGS
--        safe_LDFLAGS=$LDFLAGS
--        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
--        LDFLAGS="$LDFLAGS -shared -fPIC"
-+kde_cv_berk_database=NO
-+if test "xNO" = "x$kde_cv_berk_database" ; then
- 
--        cat >conftest.$ac_ext <<_ACEOF
-+LIBS="$kde_db_safe -l$ac_db_name"
-+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;
--          }
-+#include <$ac_db_include_file>
- 
- int
- main ()
- {
--/* elvis is alive */
-+
-+#if DB_VERSION_MAJOR == 4
-+DB *db;
-+#if DB_VERSION_MINOR > 0
-+db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#else
-+db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#endif
-+#else
-+error
-+#endif
-+
-   ;
-   return 0;
+@@ -33481,24 +36131,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38007,7 +37525,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
+-	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
@@ -38032,153 +37550,20 @@
 +  (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
--
--      fi
--
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
--
--fi
--
--  fi
--
--
--DO_NOT_COMPILE="$DO_NOT_COMPILE kappgen kstartperf"
--CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
--
--for ac_prog in flex lex
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_LEX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$LEX"; then
--  ac_cv_prog_LEX="$LEX" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_LEX="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
-+  (exit $ac_status); }; }; then
-+  kde_cv_berk_database=$ac_db_name
+   (exit $ac_status); }; }; then
+@@ -33508,8 +36170,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
--fi
--fi
--LEX=$ac_cv_prog_LEX
--if test -n "$LEX"; then
--  echo "$as_me:$LINENO: result: $LEX" >&5
--echo "${ECHO_T}$LEX" >&6
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
 +
-+
  fi
- 
--  test -n "$LEX" && break
--done
--test -n "$LEX" || LEX=":"
+-rm -f conftest.err conftest.$ac_objext \
++
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
+       conftest$ac_exeext conftest.$ac_ext
  
--if test -z "$LEXLIB"
--then
--  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
--echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
--if test "${ac_cv_lib_fl_yywrap+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfl  $LIBS"
-+fi
-+if test "xNO" = "x$kde_cv_berk_database" ; then
-+
-+LIBS="$kde_db_safe -ldb4"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -32994,66 +36190,77 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char yywrap ();
-+#include <db4/db.h>
-+
- int
- main ()
- {
--yywrap ();
-+
-+#if DB_VERSION_MAJOR == 4
-+DB *db;
-+#if DB_VERSION_MINOR > 0
-+db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#else
-+db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#endif
-+#else
-+error
-+#endif
-+
-   ;
-   return 0;
+ fi
+@@ -33545,24 +36209,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38223,72 +37608,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_cv_lib_fl_yywrap=yes
-+  kde_cv_berk_database=db4
-+
- else
+@@ -33572,8 +36248,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_lib_fl_yywrap=no
 +
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
--echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
--if test $ac_cv_lib_fl_yywrap = yes; then
--  LEXLIB="-lfl"
--else
--  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
--echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
--if test "${ac_cv_lib_l_yywrap+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ll  $LIBS"
-+if test "xNO" = "x$kde_cv_berk_database" ; then
-+
-+LIBS="$kde_db_safe -ldb4"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -33061,163 +36268,261 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char yywrap ();
-+#include <db.h>
-+
- int
- main ()
- {
--yywrap ();
-+
-+#if DB_VERSION_MAJOR == 4
-+DB *db;
-+#if DB_VERSION_MINOR > 0
-+db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#else
-+db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#endif
-+#else
-+error
-+#endif
-+
-   ;
-   return 0;
+ fi
+@@ -33609,24 +36287,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38333,105 +37665,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_cv_lib_l_yywrap=yes
-+  kde_cv_berk_database=db4-db
-+
- else
+@@ -33636,8 +36326,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_lib_l_yywrap=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
--echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
--if test $ac_cv_lib_l_yywrap = yes; then
--  LEXLIB="-ll"
--fi
- 
++
  fi
- 
--fi
+-rm -f conftest.err conftest.$ac_objext \
++
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
+       conftest$ac_exeext conftest.$ac_ext
  
--if test "x$LEX" != "x:"; then
--  echo "$as_me:$LINENO: checking lex output file root" >&5
--echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
--if test "${ac_cv_prog_lex_root+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  # The minimal lex program is just a single line: %%.  But some broken lexes
--# (Solaris, I think it was) want two %% lines, so accommodate them.
--cat >conftest.l <<_ACEOF
--%%
--%%
--_ACEOF
--{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
--  (eval $LEX conftest.l) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--if test -f lex.yy.c; then
--  ac_cv_prog_lex_root=lex.yy
--elif test -f lexyy.c; then
--  ac_cv_prog_lex_root=lexyy
--else
--  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
--echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
--   { (exit 1); exit 1; }; }
--fi
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
--echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
--rm -f conftest.l
--LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+if test "xNO" = "x$kde_cv_berk_database" ; then
- 
--echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
--echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
--if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  # POSIX says lex can declare yytext either as a pointer or an array; the
--# default is implementation-dependent. Figure out which it is, since
--# not all implementations provide the %pointer and %array declarations.
--ac_cv_prog_lex_yytext_pointer=no
--echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
--ac_save_LIBS=$LIBS
--LIBS="$LIBS $LEXLIB"
-+LIBS="$kde_db_safe -ldb"
- cat >conftest.$ac_ext <<_ACEOF
--`cat $LEX_OUTPUT_ROOT.c`
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+#include <db.h>
-+
-+int
-+main ()
-+{
-+
-+#if DB_VERSION_MAJOR == 4
-+DB *db;
-+#if DB_VERSION_MINOR > 0
-+db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#else
-+db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#endif
-+#else
-+error
-+#endif
-+
-+  ;
-+  return 0;
-+}
+@@ -33673,24 +36365,36 @@
+ }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -38475,10 +37722,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_cv_prog_lex_yytext_pointer=yes
-+  kde_cv_berk_database=db
-+
- else
+@@ -33700,8 +36404,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38488,164 +37732,98 @@
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_save_LIBS
--rm -f "${LEX_OUTPUT_ROOT}.c"
  
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
--echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
--if test $ac_cv_prog_lex_yytext_pointer = yes; then
+@@ -33718,16 +36424,16 @@
  
--cat >>confdefs.h <<\_ACEOF
--#define YYTEXT_POINTER 1
--_ACEOF
-+LIBS=$kde_db_safe_LIBS
-+LDFLAGS=$kde_safe_LDFLAGS
-+
- 
- fi
- 
-+
-+kde_db_header=""
-+DBSEARCHENGINE=dbsearchengine
-+
-+case "$kde_cv_berk_database" in
-+ NO)
+ case "$kde_cv_berk_database" in
+  NO)
+-   echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +   { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+   LIB_DBIV=""
-+   DBSEARCHENGINE=""
-+   ;;
-+ db)
-+   LIB_DBIV="-l$ac_db_name"
-+   kde_db_header=db.h
+    LIB_DBIV=""
+    DBSEARCHENGINE=""
+    ;;
+  db)
+    LIB_DBIV="-l$ac_db_name"
+    kde_db_header=db.h
+-   echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
+-echo "${ECHO_T}-l$ac_db_name" >&6
 +   { echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
 +echo "${ECHO_T}-l$ac_db_name" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DB_DB_H 1
-+_ACEOF
-+
-+   ;;
-+ db4-db)
-+   LIB_DBIV='-ldb4'
-+   kde_db_header=db.h
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DB_DB_H 1
+@@ -33737,8 +36443,8 @@
+  db4-db)
+    LIB_DBIV='-ldb4'
+    kde_db_header=db.h
+-   echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
+-echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6
 +   { echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
 +echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DB_DB_H 1
-+_ACEOF
-+
-+   ;;
-+ db4)
-+   LIB_DBIV='-ldb4'
-+   kde_db_header=db4/db.h
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DB_DB_H 1
+@@ -33748,8 +36454,8 @@
+  db4)
+    LIB_DBIV='-ldb4'
+    kde_db_header=db4/db.h
+-   echo "$as_me:$LINENO: result: -ldb4" >&5
+-echo "${ECHO_T}-ldb4" >&6
 +   { echo "$as_me:$LINENO: result: -ldb4" >&5
 +echo "${ECHO_T}-ldb4" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DB4_DB_H 1
-+_ACEOF
-+
-+   ;;
-+ $ac_db_name)
-+   LIB_DBIV="-l$ac_db_name"
-+   kde_db_header="$ac_db_include_file"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DB4_DB_H 1
+@@ -33759,8 +36465,8 @@
+  $ac_db_name)
+    LIB_DBIV="-l$ac_db_name"
+    kde_db_header="$ac_db_include_file"
+-   echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
+-echo "${ECHO_T}user specified $ac_db_name" >&6
 +   { echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
 +echo "${ECHO_T}user specified $ac_db_name" >&6; }
-+   if test "x$ac_db_include_file" = "xdb.h" ; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DB_DB_H 1
-+_ACEOF
-+
-+   else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define USE_DB_H_PATH <$ac_db_include_file>
-+_ACEOF
-+
-+   fi
-+
-+   ;;
-+esac
-+
-+DBIV_LDFLAGS="$ac_db_libraries"
-+DBIV_INCLUDES="$ac_db_includes"
-+DBIV_NAME="$ac_db_name"
-+
-+if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
-+  { { echo "$as_me:$LINENO: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&5
-+echo "$as_me: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&2;}
-+   { (exit 1); exit 1; }; }
- fi
--if test "$LEX" = :; then
--  LEX=${am_missing_run}flex
- fi
+    if test "x$ac_db_include_file" = "xdb.h" ; then
  
+ cat >>confdefs.h <<_ACEOF
+@@ -33813,8 +36519,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
  
- 
-- ac_ext=cc
-+
-+
-+
-+
-+
-+
-+if test -n "$DBSEARCHENGINE"; then
-+  include_DBSEARCHENGINE_TRUE=
-+  include_DBSEARCHENGINE_FALSE='#'
-+else
-+  include_DBSEARCHENGINE_TRUE='#'
-+  include_DBSEARCHENGINE_FALSE=
-+fi
-+
-+
-+
-+
-+HAVE_KCAL=0
-+
-+   kde_safe_cppflags=$CPPFLAGS
-+   CPPFLAGS="$CPPFLAGS $all_includes"
-+
+-
+-    ac_ext=cc
 +    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33226,18 +36531,18 @@
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+@@ -33824,17 +36529,17 @@
  
  
--if test "${ac_cv_header_FlexLexer_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
--echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
--if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+   if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
+    if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
+-echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
 +echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
+ if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
--echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
--echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
+-echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6; }
  else
    # Is the header compilable?
--echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
--echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6
+-echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
+-echo $ECHO_N "checking libkcal/resourcecalendar.h usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
 +echo $ECHO_N "checking libkcal/resourcecalendar.h usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33245,27 +36550,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <FlexLexer.h>
-+#include <libkcal/resourcecalendar.h>
+@@ -33845,24 +36550,36 @@
+ #include <libkcal/resourcecalendar.h>
  _ACEOF
  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -38689,7 +37867,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33274,25 +36591,31 @@
+@@ -33871,15 +36588,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38705,18 +37883,16 @@
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
--echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
--echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6
+-echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h presence" >&5
+-echo $ECHO_N "checking libkcal/resourcecalendar.h presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h presence" >&5
 +echo $ECHO_N "checking libkcal/resourcecalendar.h presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -33888,8 +36606,13 @@
  /* end confdefs.h.  */
--#include <FlexLexer.h>
-+#include <libkcal/resourcecalendar.h>
+ #include <libkcal/resourcecalendar.h>
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -38730,7 +37906,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33316,703 +36639,834 @@
+@@ -33913,9 +36636,10 @@
  
    ac_header_preproc=no
  fi
@@ -38743,30 +37919,10 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
+@@ -33939,25 +36663,18 @@
+ echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&2;}
 -    (
 -      cat <<\_ASBOX
 -## ------------------------------------------ ##
@@ -38775,193 +37931,59 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&2;}
 +
      ;;
  esac
--echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
--echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
--if test "${ac_cv_header_FlexLexer_h+set}" = set; then
+-echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
+-echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
 +echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
+ if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  ac_cv_header_FlexLexer_h=$ac_header_preproc
-+  ac_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
+   ac_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
  fi
--echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
--echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
+-echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
 +echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6; }
  
  fi
--if test $ac_cv_header_FlexLexer_h = yes; then
--  kde_have_flex=yes
-+if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
-+  HAVE_KCAL=1
- else
--  kde_have_flex=no
-+  { echo "$as_me:$LINENO: WARNING: Unable to find libkcal. The Bugzilla todo list \
-+ resource for KOrganizer won't be compiled." >&5
-+echo "$as_me: WARNING: Unable to find libkcal. The Bugzilla todo list \
-+ resource for KOrganizer won't be compiled." >&2;}
- fi
- 
- 
--
--if test "$kde_have_flex" = "no"; then
--  DO_NOT_COMPILE="$DO_NOT_COMPILE kbabel"
--fi
--ac_ext=c
-+   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
- 
-+   CPPFLAGS=$kde_safe_cppflags
- 
- 
--# Check whether --with-berkeley-db or --without-berkeley-db was given.
--if test "${with_berkeley_db+set}" = set; then
--  withval="$with_berkeley_db"
- 
-+if test "$HAVE_KCAL" = 1; then
-+  include_kcalresource_TRUE=
-+  include_kcalresource_FALSE='#'
- else
--  with_berkeley_db=check
--fi;
--
--LIB_DBIV=""
--if test "x$with_berkeley_db" != xno; then
--
--echo "$as_me:$LINENO: checking for Berkeley Database IV" >&5
--echo $ECHO_N "checking for Berkeley Database IV... $ECHO_C" >&6
--
--db_libraries=""
--db_includes=""
--db_name=""
--ac_db_name="db"
--ac_db_includes=""
--ac_db_libraries=""
--ac_db_include_file="db.h"
--
--
--# Check whether --with-db-dir or --without-db-dir was given.
--if test "${with_db_dir+set}" = set; then
--  withval="$with_db_dir"
--    ac_db_includes=-I"$withval"/include
--       ac_db_libraries=-L"$withval"/lib
--
--fi;
--
--# Check whether --with-db-include-dir or --without-db-include-dir was given.
--if test "${with_db_include_dir+set}" = set; then
--  withval="$with_db_include_dir"
--    ac_db_includes=-I"$withval"
--
--fi;
--
--# Check whether --with-db-include or --without-db-include was given.
--if test "${with_db_include+set}" = set; then
--  withval="$with_db_include"
--    ac_db_include_file=-I"$withval"
--
--fi;
-+  include_kcalresource_TRUE='#'
-+  include_kcalresource_FALSE=
-+fi
- 
--# Check whether --with-db-lib-dir or --without-db-lib-dir was given.
--if test "${with_db_lib_dir+set}" = set; then
--  withval="$with_db_lib_dir"
--    ac_db_libraries=-L"$withval"
- 
--fi;
- 
--# Check whether --with-db-name or --without-db-name was given.
--if test "${with_db_name+set}" = set; then
--  withval="$with_db_name"
--    ac_db_name="$withval"
-+KCACHEGRIND_VERSION=0.4.6kde
- 
--fi;
- 
- 
- 
--if test "${kde_cv_berk_database+set}" = set; then
-+for ac_header in stdlib.h unistd.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
+@@ -33998,18 +36715,19 @@
+ for ac_header in stdlib.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  else
--
--kde_safe_LDFLAGS=$LDFLAGS
--kde_db_safe_LIBS=$LIBS
--LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $all_libraries $ac_db_libraries $all_includes $ac_db_includes"
--
--kde_cv_berk_database=NO
--if test "xNO" = "x$kde_cv_berk_database" ; then
--
--LIBS="$kde_db_safe -l$ac_db_name"
-+  # Is the header compilable?
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--#include <$ac_db_include_file>
--
--int
--main ()
--{
--
--#if DB_VERSION_MAJOR == 4
--DB *db;
--#if DB_VERSION_MINOR > 0
--db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#else
--db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#endif
--#else
--error
--#endif
--
--  ;
--  return 0;
--}
-+$ac_includes_default
-+#include <$ac_header>
+@@ -34020,24 +36738,36 @@
+ #include <$ac_header>
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -38989,10 +38011,9 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
+ 	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -s conftest.$ac_objext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -39002,60 +38023,35 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  kde_cv_berk_database=$ac_db_name
--
-+  ac_header_compiler=yes
- else
+@@ -34046,15 +36776,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+-ac_header_compiler=no
 +	ac_header_compiler=no
  fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
- 
--fi
--if test "xNO" = "x$kde_cv_berk_database" ; then
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
  
--LIBS="$kde_db_safe -ldb4"
-+# Is the header present?
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -34063,8 +36794,13 @@
  /* end confdefs.h.  */
--
--#include <db4/db.h>
--
--int
--main ()
--{
--
--#if DB_VERSION_MAJOR == 4
--DB *db;
--#if DB_VERSION_MINOR > 0
--db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#else
--db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#endif
--#else
--error
--#endif
--
--  ;
--  return 0;
--}
-+#include <$ac_header>
+ #include <$ac_header>
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39066,217 +38062,97 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  kde_cv_berk_database=db4
--
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34088,9 +36824,10 @@
  
-+  ac_header_preproc=no
+   ac_header_preproc=no
  fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--
--fi
--if test "xNO" = "x$kde_cv_berk_database" ; then
--
--LIBS="$kde_db_safe -ldb4"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <db.h>
--
--int
--main ()
--{
- 
--#if DB_VERSION_MAJOR == 4
--DB *db;
--#if DB_VERSION_MINOR > 0
--db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#else
--db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
--#endif
--#else
--error
--#endif
-+rm -f conftest.err conftest.$ac_ext
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  kde_cv_berk_database=db4-db
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- 
-+    ;;
-+esac
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -34114,25 +36851,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
  
  fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
- 
- fi
--if test "xNO" = "x$kde_cv_berk_database" ; then
- 
--LIBS="$kde_db_safe -ldb"
--cat >conftest.$ac_ext <<_ACEOF
-+done
-+
-+
-+for ac_func in getpagesize
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -34148,9 +36879,9 @@
+ for ac_func in getpagesize
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34176,53 +36907,59 @@
  
--#include <db.h>
--
--int
--main ()
--{
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
+ #undef $ac_func
  
--#if DB_VERSION_MAJOR == 4
--DB *db;
--#if DB_VERSION_MINOR > 0
--db->open( db, NULL, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+#ifdef __STDC__
-+# include <limits.h>
- #else
--db->open( db, "test.db", NULL, DB_BTREE, DB_CREATE, 0644 );
-+# include <assert.h>
- #endif
--#else
--error
-+
-+#undef $ac_func
-+
+-/* Override any gcc2 internal prototype to avoid an error.  */
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
  #endif
  
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-return f != $ac_func;
 +return $ac_func ();
    ;
    return 0;
@@ -39324,228 +38200,126 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  kde_cv_berk_database=db
--
-+  eval "$as_ac_var=yes"
- else
+@@ -34231,13 +36968,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
 -rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
- 
++
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
+       conftest$ac_exeext conftest.$ac_ext
  fi
--
--LIBS=$kde_db_safe_LIBS
--LDFLAGS=$kde_safe_LDFLAGS
--
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
- 
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -34246,8 +36985,8 @@
  fi
-+done
+ done
  
+-echo "$as_me:$LINENO: checking for working mmap" >&5
+-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for working mmap" >&5
 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
-+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  ac_cv_func_mmap_fixed_mapped=no
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+/* malloc might have been renamed as rpl_malloc. */
-+#undef malloc
+ if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34289,21 +37028,21 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
  
--kde_db_header=""
--DBSEARCHENGINE=dbsearchengine
-+/* Thanks to Mike Haertel and Jim Avera for this test.
-+   Here is a matrix of mmap possibilities:
-+	mmap private not fixed
-+	mmap private fixed at somewhere currently unmapped
-+	mmap private fixed at somewhere already mapped
-+	mmap shared not fixed
-+	mmap shared fixed at somewhere currently unmapped
-+	mmap shared fixed at somewhere already mapped
-+   For private mappings, we should verify that changes cannot be read()
-+   back from the file, nor mmap's back from the file at a different
-+   address.  (There have been systems where private was not correctly
-+   implemented like the infamous i386 svr4.0, and systems where the
-+   VM page cache was not coherent with the file system buffer cache
-+   like early versions of FreeBSD and possibly contemporary NetBSD.)
-+   For shared mappings, we should conversely verify that changes get
-+   propagated back to all the places they're supposed to be.
- 
--case "$kde_cv_berk_database" in
-- NO)
--   echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--   LIB_DBIV=""
--   DBSEARCHENGINE=""
--   ;;
-- db)
--   LIB_DBIV="-l$ac_db_name"
--   kde_db_header=db.h
--   echo "$as_me:$LINENO: result: -l$ac_db_name" >&5
--echo "${ECHO_T}-l$ac_db_name" >&6
-+   Grep wants private fixed already mapped.
-+   The main things grep needs to know about mmap are:
-+   * does it exist and is it safe to write into the mmap'd area
-+   * how to use it (BSD variants)  */
- 
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB_DB_H 1
--_ACEOF
-+#include <fcntl.h>
-+#include <sys/mman.h>
- 
--   ;;
-- db4-db)
--   LIB_DBIV='-ldb4'
--   kde_db_header=db.h
--   echo "$as_me:$LINENO: result: \"flag is -ldb4 and header is db.h\"" >&5
--echo "${ECHO_T}\"flag is -ldb4 and header is db.h\"" >&6
+-#if !STDC_HEADERS && !HAVE_STDLIB_H
 +#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-+char *malloc ();
-+#endif
+ char *malloc ();
+ #endif
  
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB_DB_H 1
--_ACEOF
-+/* This mess was copied from the GNU getpagesize.h.  */
+ /* This mess was copied from the GNU getpagesize.h.  */
+-#if !HAVE_GETPAGESIZE
 +#ifndef HAVE_GETPAGESIZE
-+/* Assume that all systems that can run configure have sys/param.h.  */
+ /* Assume that all systems that can run configure have sys/param.h.  */
+-# if !HAVE_SYS_PARAM_H
 +# ifndef HAVE_SYS_PARAM_H
-+#  define HAVE_SYS_PARAM_H 1
-+# endif
+ #  define HAVE_SYS_PARAM_H 1
+ # endif
  
--   ;;
-- db4)
--   LIB_DBIV='-ldb4'
--   kde_db_header=db4/db.h
--   echo "$as_me:$LINENO: result: -ldb4" >&5
--echo "${ECHO_T}-ldb4" >&6
-+# ifdef _SC_PAGESIZE
-+#  define getpagesize() sysconf(_SC_PAGESIZE)
-+# else /* no _SC_PAGESIZE */
+ # ifdef _SC_PAGESIZE
+ #  define getpagesize() sysconf(_SC_PAGESIZE)
+ # else /* no _SC_PAGESIZE */
+-#  if HAVE_SYS_PARAM_H
 +#  ifdef HAVE_SYS_PARAM_H
-+#   include <sys/param.h>
-+#   ifdef EXEC_PAGESIZE
-+#    define getpagesize() EXEC_PAGESIZE
-+#   else /* no EXEC_PAGESIZE */
-+#    ifdef NBPG
-+#     define getpagesize() NBPG * CLSIZE
-+#     ifndef CLSIZE
-+#      define CLSIZE 1
-+#     endif /* no CLSIZE */
-+#    else /* no NBPG */
-+#     ifdef NBPC
-+#      define getpagesize() NBPC
-+#     else /* no NBPC */
-+#      ifdef PAGESIZE
-+#       define getpagesize() PAGESIZE
-+#      endif /* PAGESIZE */
-+#     endif /* no NBPC */
-+#    endif /* no NBPG */
-+#   endif /* no EXEC_PAGESIZE */
-+#  else /* no HAVE_SYS_PARAM_H */
-+#   define getpagesize() 8192	/* punt totally */
-+#  endif /* no HAVE_SYS_PARAM_H */
-+# endif /* no _SC_PAGESIZE */
- 
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB4_DB_H 1
--_ACEOF
-+#endif /* no HAVE_GETPAGESIZE */
- 
--   ;;
-- $ac_db_name)
--   LIB_DBIV="-l$ac_db_name"
--   kde_db_header="$ac_db_include_file"
--   echo "$as_me:$LINENO: result: user specified $ac_db_name" >&5
--echo "${ECHO_T}user specified $ac_db_name" >&6
--   if test "x$ac_db_include_file" = "xdb.h" ; then
-+int
-+main ()
-+{
-+  char *data, *data2, *data3;
-+  int i, pagesize;
-+  int fd;
- 
--cat >>confdefs.h <<_ACEOF
--#define HAVE_DB_DB_H 1
--_ACEOF
-+  pagesize = getpagesize ();
- 
--   else
-+  /* First, make a file with some known garbage in it. */
-+  data = (char *) malloc (pagesize);
-+  if (!data)
+ #   include <sys/param.h>
+ #   ifdef EXEC_PAGESIZE
+ #    define getpagesize() EXEC_PAGESIZE
+@@ -34342,15 +37081,15 @@
+   /* First, make a file with some known garbage in it. */
+   data = (char *) malloc (pagesize);
+   if (!data)
+-    exit (1);
 +    return 1;
-+  for (i = 0; i < pagesize; ++i)
-+    *(data + i) = rand ();
-+  umask (0);
-+  fd = creat ("conftest.mmap", 0600);
-+  if (fd < 0)
+   for (i = 0; i < pagesize; ++i)
+     *(data + i) = rand ();
+   umask (0);
+   fd = creat ("conftest.mmap", 0600);
+   if (fd < 0)
+-    exit (1);
 +    return 1;
-+  if (write (fd, data, pagesize) != pagesize)
+   if (write (fd, data, pagesize) != pagesize)
+-    exit (1);
 +    return 1;
-+  close (fd);
+   close (fd);
  
--cat >>confdefs.h <<_ACEOF
--#define USE_DB_H_PATH <$ac_db_include_file>
--_ACEOF
-+  /* Next, try to mmap the file at a fixed address which already has
-+     something else allocated at it.  If we can, also make sure that
-+     we see the same garbage.  */
-+  fd = open ("conftest.mmap", O_RDWR);
-+  if (fd < 0)
+   /* Next, try to mmap the file at a fixed address which already has
+@@ -34358,17 +37097,17 @@
+      we see the same garbage.  */
+   fd = open ("conftest.mmap", O_RDWR);
+   if (fd < 0)
+-    exit (1);
 +    return 1;
-+  data2 = (char *) malloc (2 * pagesize);
-+  if (!data2)
+   data2 = (char *) malloc (2 * pagesize);
+   if (!data2)
+-    exit (1);
+-  data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
 +    return 1;
 +  data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
-+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+   if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+ 		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+-    exit (1);
 +    return 1;
-+  for (i = 0; i < pagesize; ++i)
-+    if (*(data + i) != *(data2 + i))
+   for (i = 0; i < pagesize; ++i)
+     if (*(data + i) != *(data2 + i))
+-      exit (1);
 +      return 1;
  
--   fi
-+  /* Finally, make sure that changes to the mapped area do not
-+     percolate back to the file as seen by read().  (This is a bug on
-+     some variants of i386 svr4.0.)  */
-+  for (i = 0; i < pagesize; ++i)
-+    *(data2 + i) = *(data2 + i) + 1;
-+  data3 = (char *) malloc (pagesize);
-+  if (!data3)
+   /* Finally, make sure that changes to the mapped area do not
+      percolate back to the file as seen by read().  (This is a bug on
+@@ -34377,24 +37116,33 @@
+     *(data2 + i) = *(data2 + i) + 1;
+   data3 = (char *) malloc (pagesize);
+   if (!data3)
+-    exit (1);
 +    return 1;
-+  if (read (fd, data3, pagesize) != pagesize)
+   if (read (fd, data3, pagesize) != pagesize)
+-    exit (1);
 +    return 1;
-+  for (i = 0; i < pagesize; ++i)
-+    if (*(data + i) != *(data3 + i))
+   for (i = 0; i < pagesize; ++i)
+     if (*(data + i) != *(data3 + i))
+-      exit (1);
 +      return 1;
-+  close (fd);
+   close (fd);
+-  exit (0);
 +  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39553,423 +38327,251 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_func_mmap_fixed_mapped=yes
-+else
-+  echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--   ;;
--esac
-+( exit $ac_status )
-+ac_cv_func_mmap_fixed_mapped=no
-+fi
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34407,11 +37155,13 @@
+ ( exit $ac_status )
+ ac_cv_func_mmap_fixed_mapped=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
- 
--DBIV_LDFLAGS="$ac_db_libraries"
--DBIV_INCLUDES="$ac_db_includes"
--DBIV_NAME="$ac_db_name"
- 
--if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
--  { { echo "$as_me:$LINENO: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&5
--echo "$as_me: error: --with-berkeley-db was given, but test for Berkeley DB IV failed" >&2;}
--   { (exit 1); exit 1; }; }
  fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
-+if test $ac_cv_func_mmap_fixed_mapped = yes; then
 +
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_MMAP 1
-+_ACEOF
 +
  fi
-+rm -f conftest.mmap
+-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
+ if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
+ cat >>confdefs.h <<\_ACEOF
+@@ -34424,13 +37174,13 @@
  
  
  
+-# Check whether --with-subversion or --without-subversion was given.
 +# Check whether --with-subversion was given.
-+if test "${with_subversion+set}" = set; then
+ if test "${with_subversion+set}" = set; then
+-  withval="$with_subversion"
+-
 +  withval=$with_subversion;
-+else
-+  with_subversion=check
+ else
+   with_subversion=check
+-fi;
 +fi
 +
  
-+SVN_SUBDIR=""
-+if test "x$with_subversion" != xno; then
+ SVN_SUBDIR=""
+ if test "x$with_subversion" != xno; then
+@@ -34438,17 +37188,17 @@
+ APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
+ SVN_SUBDIR="svn"
  
-+APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
-+SVN_SUBDIR="svn"
- 
+-# Check whether --with-apr-config or --without-apr-config was given.
 +# Check whether --with-apr-config was given.
-+if test "${with_apr_config+set}" = set; then
+ if test "${with_apr_config+set}" = set; then
+-  withval="$with_apr_config"
+-
 +  withval=$with_apr_config;
-+    if test "$withval" != "yes" -a "$withval" != ""; then
-+        APR_CONFIGS=$withval
-+    fi
+     if test "$withval" != "yes" -a "$withval" != ""; then
+         APR_CONFIGS=$withval
+     fi
  
+-fi;
+-echo "$as_me:$LINENO: checking for APR" >&5
+-echo $ECHO_N "checking for APR... $ECHO_C" >&6
 +fi
- 
--if test -n "$DBSEARCHENGINE"; then
--  include_DBSEARCHENGINE_TRUE=
--  include_DBSEARCHENGINE_FALSE='#'
++
 +{ echo "$as_me:$LINENO: checking for APR" >&5
 +echo $ECHO_N "checking for APR... $ECHO_C" >&6; }
-+APR_CONFIG=""
-+for VALUE in $APR_CONFIGS ; do
-+	if $VALUE --cflags > /dev/null; then
-+		APR_CONFIG=$VALUE
-+		break
-+	fi
-+done
-+test $VALUE && APR_CONFIG=$VALUE
-+if test $APR_CONFIG ; then
+ APR_CONFIG=""
+ for VALUE in $APR_CONFIGS ; do
+ 	if $VALUE --cflags > /dev/null; then
+@@ -34458,11 +37208,11 @@
+ done
+ test $VALUE && APR_CONFIG=$VALUE
+ if test $APR_CONFIG ; then
+-    echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
 +    { echo "$as_me:$LINENO: result: found" >&5
 +echo "${ECHO_T}found" >&6; }
  else
--  include_DBSEARCHENGINE_TRUE='#'
--  include_DBSEARCHENGINE_FALSE=
+-    echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +    { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+	SVN_SUBDIR=
+ 	SVN_SUBDIR=
  fi
  
-+APR_CPPFLAGS="`$APR_CONFIG --cppflags`"
-+APR_INCLUDE="`$APR_CONFIG --includes`"
-+APR_LIBS="`$APR_CONFIG --link-ld --libs`"
+@@ -34473,17 +37223,17 @@
  
+ APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
  
-+APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
- 
--HAVE_KCAL=0
--
--   kde_safe_cppflags=$CPPFLAGS
--   CPPFLAGS="$CPPFLAGS $all_includes"
+-# Check whether --with-apu-config or --without-apu-config was given.
 +# Check whether --with-apu-config was given.
-+if test "${with_apu_config+set}" = set; then
+ if test "${with_apu_config+set}" = set; then
+-  withval="$with_apu_config"
+-
 +  withval=$with_apu_config;
-+    if test "$withval" != "yes" -a "$withval" != ""; then
-+        APU_CONFIGS=$withval
-+    fi
+     if test "$withval" != "yes" -a "$withval" != ""; then
+         APU_CONFIGS=$withval
+     fi
  
+-fi;
+-echo "$as_me:$LINENO: checking for APR util" >&5
+-echo $ECHO_N "checking for APR util... $ECHO_C" >&6
 +fi
- 
--    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
++
 +{ echo "$as_me:$LINENO: checking for APR util" >&5
 +echo $ECHO_N "checking for APR util... $ECHO_C" >&6; }
-+APU_CONFIG=""
-+for VALUE in $APU_CONFIGS ; do
-+	if $VALUE --includes > /dev/null; then
-+		APU_CONFIG=$VALUE
-+		break
-+	fi
-+done
-+if test $APU_CONFIG ; then
+ APU_CONFIG=""
+ for VALUE in $APU_CONFIGS ; do
+ 	if $VALUE --includes > /dev/null; then
+@@ -34492,26 +37242,26 @@
+ 	fi
+ done
+ if test $APU_CONFIG ; then
+-    echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
 +    { echo "$as_me:$LINENO: result: found" >&5
 +echo "${ECHO_T}found" >&6; }
-+else
+ else
+-    echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +    { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+	SVN_SUBDIR=
-+fi
-+APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
-+APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
+ 	SVN_SUBDIR=
+ fi
+ APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
+ APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
  
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-echo "$as_me:$LINENO: checking for Subversion svn-config" >&5
+-echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for Subversion svn-config" >&5
 +echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6; }
  
+-# Check whether --with-subversion-dir or --without-subversion-dir was given.
 +# Check whether --with-subversion-dir was given.
-+if test "${with_subversion_dir+set}" = set; then
+ if test "${with_subversion_dir+set}" = set; then
+-  withval="$with_subversion_dir"
+-
 +  withval=$with_subversion_dir;
-+		 SVNCONFIG="$withval/bin/svn-config"
+ 		 SVNCONFIG="$withval/bin/svn-config"
  
--   if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
--echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
--if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
--echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h usability" >&5
--echo $ECHO_N "checking libkcal/resourcecalendar.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <libkcal/resourcecalendar.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_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_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
+-fi;
++fi
 +
-+if test -z "$SVNCONFIG"; then
-+	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
-+	if test -n "$_SVNCONFIG"; then
-+		SVNCONFIG="$_SVNCONFIG/bin/svn-config"
-+	fi
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
  
--# Is the header present?
--echo "$as_me:$LINENO: checking libkcal/resourcecalendar.h presence" >&5
--echo $ECHO_N "checking libkcal/resourcecalendar.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <libkcal/resourcecalendar.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
-+
-+if test -x "$SVNCONFIG"; then
-+	SVNLD="`$SVNCONFIG --ldflags`"
-+	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
-+	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
-+		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
+ if test -z "$SVNCONFIG"; then
+ 	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
+@@ -34526,25 +37276,25 @@
+ 	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
+ 	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
+ 		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
+-	echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
 +	{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  else
--  ac_cpp_err=yes
+-	echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +	{ echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+	SVNLD=""
-+		SVN_INCLUDES="/usr/local/include /usr/include"
-+
+ 	SVNLD=""
+ 		SVN_INCLUDES="/usr/local/include /usr/include"
+ 
+-# Check whether --with-svn-include or --without-svn-include was given.
 +# Check whether --with-svn-include was given.
-+if test "${with_svn_include+set}" = set; then
+ if test "${with_svn_include+set}" = set; then
+-  withval="$with_svn_include"
+-
 +  withval=$with_svn_include;
-+				 if test "$withval" != "yes" -a "$withval" != ""; then
-+					 SVN_INCLUDES=$withval
-+				 fi
-+
- fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ 				 if test "$withval" != "yes" -a "$withval" != ""; then
+ 					 SVN_INCLUDES=$withval
+ 				 fi
  
--  ac_header_preproc=no
+-fi;
+-	echo "$as_me:$LINENO: checking for Subversion headers" >&5
+-echo $ECHO_N "checking for Subversion headers... $ECHO_C" >&6
++fi
++
 +	{ echo "$as_me:$LINENO: checking for Subversion headers" >&5
 +echo $ECHO_N "checking for Subversion headers... $ECHO_C" >&6; }
-+	SVN_INCLUDE=""
-+	for VALUE in $SVN_INCLUDES ; do
-+		if test -f $VALUE/subversion-1/svn_types.h ; then
-+			SVN_INCLUDE="-I$VALUE"
-+			break
-+		fi
-+	done
-+	if test $SVN_INCLUDE ; then
+ 	SVN_INCLUDE=""
+ 	for VALUE in $SVN_INCLUDES ; do
+ 		if test -f $VALUE/subversion-1/svn_types.h ; then
+@@ -34553,26 +37303,26 @@
+ 		fi
+ 	done
+ 	if test $SVN_INCLUDE ; then
+-		echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
 +		{ echo "$as_me:$LINENO: result: found" >&5
 +echo "${ECHO_T}found" >&6; }
-+	else
+ 	else
+-		echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +		{ echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+		SVN_SUBDIR=
-+	fi
-+	SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
-+
+ 		SVN_SUBDIR=
+ 	fi
+ 	SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
+ 
+-# Check whether --with-svn-lib or --without-svn-lib was given.
 +# Check whether --with-svn-lib was given.
-+if test "${with_svn_lib+set}" = set; then
+ if test "${with_svn_lib+set}" = set; then
+-  withval="$with_svn_lib"
+-
 +  withval=$with_svn_lib;
-+			     if test "$withval" != "yes" -a "$withval" != ""; then
-+			         SVN_LIBS=$withval
-+			     fi
-+
- fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
+ 			     if test "$withval" != "yes" -a "$withval" != ""; then
+ 			         SVN_LIBS=$withval
+ 			     fi
  
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: libkcal/resourcecalendar.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--echo "$as_me:$LINENO: checking for libkcal/resourcecalendar.h" >&5
--echo $ECHO_N "checking for libkcal/resourcecalendar.h... $ECHO_C" >&6
--if test "${ac_cv_header_libkcal_resourcecalendar_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_header_libkcal_resourcecalendar_h=$ac_header_preproc
+-fi;
+-	echo "$as_me:$LINENO: checking for Subversion libraries" >&5
+-echo $ECHO_N "checking for Subversion libraries... $ECHO_C" >&6
++fi
++
 +	{ echo "$as_me:$LINENO: checking for Subversion libraries" >&5
 +echo $ECHO_N "checking for Subversion libraries... $ECHO_C" >&6; }
-+	SVN_LIB=""
-+	for VALUE in $SVN_LIBS ; do
-+		if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
-+			SVN_LIB="-L$VALUE"
-+			break
-+		fi
-+	done
-+	if test $SVN_LIB ; then
+ 	SVN_LIB=""
+ 	for VALUE in $SVN_LIBS ; do
+ 		if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
+@@ -34581,11 +37331,11 @@
+ 		fi
+ 	done
+ 	if test $SVN_LIB ; then
+-		echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
 +		{ echo "$as_me:$LINENO: result: found" >&5
 +echo "${ECHO_T}found" >&6; }
-+	else
+ 	else
+-		echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +		{ echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+		SVN_SUBDIR=
-+	fi
+ 		SVN_SUBDIR=
+ 	fi
  fi
--echo "$as_me:$LINENO: result: $ac_cv_header_libkcal_resourcecalendar_h" >&5
--echo "${ECHO_T}$ac_cv_header_libkcal_resourcecalendar_h" >&6
-+SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
-+SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
-+SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
- 
-+if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
-+  { { echo "$as_me:$LINENO: error: --with-subversion was given, but test for subversion failed" >&5
-+echo "$as_me: error: --with-subversion was given, but test for subversion failed" >&2;}
-+   { (exit 1); exit 1; }; }
- fi
--if test $ac_cv_header_libkcal_resourcecalendar_h = yes; then
--  HAVE_KCAL=1
--else
--  { echo "$as_me:$LINENO: WARNING: Unable to find libkcal. The Bugzilla todo list \
-- resource for KOrganizer won't be compiled." >&5
--echo "$as_me: WARNING: Unable to find libkcal. The Bugzilla todo list \
-- resource for KOrganizer won't be compiled." >&2;}
- fi
- 
- 
--   ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--   CPPFLAGS=$kde_safe_cppflags
- 
- 
- 
--if test "$HAVE_KCAL" = 1; then
--  include_kcalresource_TRUE=
--  include_kcalresource_FALSE='#'
-+
-+if test -n "$SVN_SUBDIR"; then
-+  include_kioslave_svn_TRUE=
-+  include_kioslave_svn_FALSE='#'
-+else
-+  include_kioslave_svn_TRUE='#'
-+  include_kioslave_svn_FALSE=
-+fi
-+
-+
-+
-+case "$host" in
-+   *-gnu)
-+      saved_LIBS="$LIBS"
-+      LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic"
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
+@@ -34636,24 +37386,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -39977,111 +38579,6 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  kde_compile_kmtrace=$GCC
- else
--  include_kcalresource_TRUE='#'
--  include_kcalresource_FALSE=
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	kde_compile_kmtrace=no
- fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+      KMTRACE_LIBS=$LIBS
- 
-+      LIBS="$saved_LIBS"
-+      ;;
-+   *)
-+      kde_compile_kmtrace=no
-+      ;;
-+esac
- 
--KCACHEGRIND_VERSION=0.4.6kde
-+if test ! "x$kde_compile_kmtrace" = "xyes"; then
-+   DO_NOT_COMPILE="$DO_NOT_COMPILE kmtrace"
-+fi
- 
- 
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- 
--for ac_header in stdlib.h unistd.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
-+echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -34020,27 +37474,39 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <$ac_header>
-+#include <FlexLexer.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
@@ -40092,7 +38589,7 @@
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -40102,7 +38599,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+ 	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 +  { (case "(($ac_try" in
@@ -40114,445 +38611,82 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34049,25 +37515,31 @@
+@@ -34662,9 +37424,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_header_compiler=no
-+	ac_header_compiler=no
+-kde_compile_kmtrace=no
++	kde_compile_kmtrace=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
+-rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+       KMTRACE_LIBS=$LIBS
  
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
-+echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <$ac_header>
-+#include <FlexLexer.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -34075,8 +37547,8 @@
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-   else
-     ac_cpp_err=
-   fi
-@@ -34091,867 +37563,456 @@
- 
-   ac_header_preproc=no
+@@ -34680,8 +37443,7 @@
  fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
  
- # So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
-+echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  eval "$as_ac_Header=\$ac_header_preproc"
-+  ac_cv_header_FlexLexer_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6; }
  
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
 -
-+if test $ac_cv_header_FlexLexer_h = yes; then
-+  kde_have_flex=yes
-+else
-+  kde_have_flex=no
- fi
- 
--done
--
--
--for ac_func in getpagesize
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -34704,9 +37466,9 @@
+ for ac_func in setenv
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -echo "$as_me:$LINENO: checking for $ac_func" >&5
 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -34732,53 +37494,59 @@
  
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
+ #undef $ac_func
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+if test "$kde_have_flex" = "no"; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-+fi
- 
--#undef $ac_func
- 
 -/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
 -{
--#endif
+ #endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
 -#else
 -char (*f) () = $ac_func;
 -#endif
 -#ifdef __cplusplus
 -}
--#endif
-+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
- 
--int
--main ()
--{
--return f != $ac_func;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_var=yes"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
- 
--fi
--done
- 
--echo "$as_me:$LINENO: checking for working mmap" >&5
--echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
--if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-+for ac_func in setenv
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$cross_compiling" = yes; then
--  ac_cv_func_mmap_fixed_mapped=no
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--/* malloc might have been renamed as rpl_malloc. */
--#undef malloc
--
--/* Thanks to Mike Haertel and Jim Avera for this test.
--   Here is a matrix of mmap possibilities:
--	mmap private not fixed
--	mmap private fixed at somewhere currently unmapped
--	mmap private fixed at somewhere already mapped
--	mmap shared not fixed
--	mmap shared fixed at somewhere currently unmapped
--	mmap shared fixed at somewhere already mapped
--   For private mappings, we should verify that changes cannot be read()
--   back from the file, nor mmap's back from the file at a different
--   address.  (There have been systems where private was not correctly
--   implemented like the infamous i386 svr4.0, and systems where the
--   VM page cache was not coherent with the file system buffer cache
--   like early versions of FreeBSD and possibly contemporary NetBSD.)
--   For shared mappings, we should conversely verify that changes get
--   propagated back to all the places they're supposed to be.
--
--   Grep wants private fixed already mapped.
--   The main things grep needs to know about mmap are:
--   * does it exist and is it safe to write into the mmap'd area
--   * how to use it (BSD variants)  */
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
- 
--#include <fcntl.h>
--#include <sys/mman.h>
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
- 
--#if !STDC_HEADERS && !HAVE_STDLIB_H
--char *malloc ();
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
  #endif
  
--/* This mess was copied from the GNU getpagesize.h.  */
--#if !HAVE_GETPAGESIZE
--/* Assume that all systems that can run configure have sys/param.h.  */
--# if !HAVE_SYS_PARAM_H
--#  define HAVE_SYS_PARAM_H 1
--# endif
--
--# ifdef _SC_PAGESIZE
--#  define getpagesize() sysconf(_SC_PAGESIZE)
--# else /* no _SC_PAGESIZE */
--#  if HAVE_SYS_PARAM_H
--#   include <sys/param.h>
--#   ifdef EXEC_PAGESIZE
--#    define getpagesize() EXEC_PAGESIZE
--#   else /* no EXEC_PAGESIZE */
--#    ifdef NBPG
--#     define getpagesize() NBPG * CLSIZE
--#     ifndef CLSIZE
--#      define CLSIZE 1
--#     endif /* no CLSIZE */
--#    else /* no NBPG */
--#     ifdef NBPC
--#      define getpagesize() NBPC
--#     else /* no NBPC */
--#      ifdef PAGESIZE
--#       define getpagesize() PAGESIZE
--#      endif /* PAGESIZE */
--#     endif /* no NBPC */
--#    endif /* no NBPG */
--#   endif /* no EXEC_PAGESIZE */
--#  else /* no HAVE_SYS_PARAM_H */
--#   define getpagesize() 8192	/* punt totally */
--#  endif /* no HAVE_SYS_PARAM_H */
--# endif /* no _SC_PAGESIZE */
-+#undef $ac_func
- 
--#endif /* no HAVE_GETPAGESIZE */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
- 
  int
  main ()
  {
--  char *data, *data2, *data3;
--  int i, pagesize;
--  int fd;
--
--  pagesize = getpagesize ();
--
--  /* First, make a file with some known garbage in it. */
--  data = (char *) malloc (pagesize);
--  if (!data)
--    exit (1);
--  for (i = 0; i < pagesize; ++i)
--    *(data + i) = rand ();
--  umask (0);
--  fd = creat ("conftest.mmap", 0600);
--  if (fd < 0)
--    exit (1);
--  if (write (fd, data, pagesize) != pagesize)
--    exit (1);
--  close (fd);
--
--  /* Next, try to mmap the file at a fixed address which already has
--     something else allocated at it.  If we can, also make sure that
--     we see the same garbage.  */
--  fd = open ("conftest.mmap", O_RDWR);
--  if (fd < 0)
--    exit (1);
--  data2 = (char *) malloc (2 * pagesize);
--  if (!data2)
--    exit (1);
--  data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
--  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
--		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
--    exit (1);
--  for (i = 0; i < pagesize; ++i)
--    if (*(data + i) != *(data2 + i))
--      exit (1);
--
--  /* Finally, make sure that changes to the mapped area do not
--     percolate back to the file as seen by read().  (This is a bug on
--     some variants of i386 svr4.0.)  */
--  for (i = 0; i < pagesize; ++i)
--    *(data2 + i) = *(data2 + i) + 1;
--  data3 = (char *) malloc (pagesize);
--  if (!data3)
--    exit (1);
--  if (read (fd, data3, pagesize) != pagesize)
--    exit (1);
--  for (i = 0; i < pagesize; ++i)
--    if (*(data + i) != *(data3 + i))
--      exit (1);
--  close (fd);
--  exit (0);
+-return f != $ac_func;
 +return $ac_func ();
-+  ;
-+  return 0;
+   ;
+   return 0;
  }
  _ACEOF
--rm -f conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+rm -f conftest.$ac_objext conftest$ac_exeext
+-  (eval $ac_link) 2>conftest.er1
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40560,12 +38694,16 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
 +	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -40575,11 +38713,10 @@
 +  (eval "$ac_try") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
@@ -40589,781 +38726,144 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  ac_cv_func_mmap_fixed_mapped=yes
-+  eval "$as_ac_var=yes"
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  echo "$as_me: failed program was:" >&5
+@@ -34787,13 +37555,15 @@
+   echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--( exit $ac_status )
--ac_cv_func_mmap_fixed_mapped=no
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-eval "$as_ac_var=no"
 +	eval "$as_ac_var=no"
  fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
--echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
--if test $ac_cv_func_mmap_fixed_mapped = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_MMAP 1
+-rm -f conftest.err conftest.$ac_objext \
++
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -34808,14 +37578,14 @@
+ HAVE_XSLT=yes
  
- fi
--rm -f conftest.mmap
--
--
--
--
--# Check whether --with-subversion or --without-subversion was given.
--if test "${with_subversion+set}" = set; then
--  withval="$with_subversion"
--
--else
--  with_subversion=check
--fi;
--
--SVN_SUBDIR=""
--if test "x$with_subversion" != xno; then
--
--APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
--SVN_SUBDIR="svn"
--
--# Check whether --with-apr-config or --without-apr-config was given.
--if test "${with_apr_config+set}" = set; then
--  withval="$with_apr_config"
--
--    if test "$withval" != "yes" -a "$withval" != ""; then
--        APR_CONFIGS=$withval
--    fi
--
--fi;
--echo "$as_me:$LINENO: checking for APR" >&5
--echo $ECHO_N "checking for APR... $ECHO_C" >&6
--APR_CONFIG=""
--for VALUE in $APR_CONFIGS ; do
--	if $VALUE --cflags > /dev/null; then
--		APR_CONFIG=$VALUE
--		break
--	fi
- done
--test $VALUE && APR_CONFIG=$VALUE
--if test $APR_CONFIG ; then
--    echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
--else
--    echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--	SVN_SUBDIR=
--fi
  
--APR_CPPFLAGS="`$APR_CONFIG --cppflags`"
--APR_INCLUDE="`$APR_CONFIG --includes`"
--APR_LIBS="`$APR_CONFIG --link-ld --libs`"
- 
- 
--APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
- 
--# Check whether --with-apu-config or --without-apu-config was given.
--if test "${with_apu_config+set}" = set; then
--  withval="$with_apu_config"
- 
--    if test "$withval" != "yes" -a "$withval" != ""; then
--        APU_CONFIGS=$withval
--    fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--fi;
--echo "$as_me:$LINENO: checking for APR util" >&5
--echo $ECHO_N "checking for APR util... $ECHO_C" >&6
--APU_CONFIG=""
--for VALUE in $APU_CONFIGS ; do
--	if $VALUE --includes > /dev/null; then
--		APU_CONFIG=$VALUE
--		break
--	fi
--done
--if test $APU_CONFIG ; then
--    echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
--else
--    echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--	SVN_SUBDIR=
--fi
--APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
--APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
- 
--echo "$as_me:$LINENO: checking for Subversion svn-config" >&5
--echo $ECHO_N "checking for Subversion svn-config... $ECHO_C" >&6
-+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
- 
--# Check whether --with-subversion-dir or --without-subversion-dir was given.
--if test "${with_subversion_dir+set}" = set; then
--  withval="$with_subversion_dir"
- 
--		 SVNCONFIG="$withval/bin/svn-config"
- 
--fi;
- 
--if test -z "$SVNCONFIG"; then
--	_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
--	if test -n "$_SVNCONFIG"; then
--		SVNCONFIG="$_SVNCONFIG/bin/svn-config"
--	fi
--fi
- 
-+HAVE_XSLT=yes
- 
--if test -x "$SVNCONFIG"; then
--	SVNLD="`$SVNCONFIG --ldflags`"
--	SVN_LIB="`$SVNCONFIG --libs` -lsvn_client-1"
--	SVN_CPPFLAGS="`$SVNCONFIG --cppflags`"
--		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
--	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
--	echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--	SVNLD=""
--		SVN_INCLUDES="/usr/local/include /usr/include"
- 
--# Check whether --with-svn-include or --without-svn-include was given.
--if test "${with_svn_include+set}" = set; then
--  withval="$with_svn_include"
+-   echo "$as_me:$LINENO: checking for xml2-config" >&5
+-echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for xml2-config" >&5
 +echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6; }
-+   if test -n "$XML_CONFIG"; then
-+        kde_cv_path="$XML_CONFIG";
-+   else
-+        kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
+    if test -n "$XML_CONFIG"; then
+         kde_cv_path="$XML_CONFIG";
+    else
+         kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
  
--				 if test "$withval" != "yes" -a "$withval" != ""; then
--					 SVN_INCLUDES=$withval
--				 fi
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
  
--fi;
--	echo "$as_me:$LINENO: checking for Subversion headers" >&5
--echo $ECHO_N "checking for Subversion headers... $ECHO_C" >&6
--	SVN_INCLUDE=""
--	for VALUE in $SVN_INCLUDES ; do
--		if test -f $VALUE/subversion-1/svn_types.h ; then
--			SVN_INCLUDE="-I$VALUE"
--			break
--		fi
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
- 	done
--	if test $SVN_INCLUDE ; then
--		echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
--	else
--		echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--		SVN_SUBDIR=
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin"
- 	fi
--	SVN_LIBS="/usr/local/lib /usr/lib /usr/lib64"
-+	IFS=$kde_save_IFS
+@@ -34858,8 +37628,8 @@
+    fi
  
--# Check whether --with-svn-lib or --without-svn-lib was given.
--if test "${with_svn_lib+set}" = set; then
--  withval="$with_svn_lib"
-+        for dir in $dirs; do
-+	  if test -x "$dir/xml2-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/xml2-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/xml2-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/xml2-config"
-+                break
-+	    fi
-+          fi
-+        done
- 
--			     if test "$withval" != "yes" -a "$withval" != ""; then
--			         SVN_LIBS=$withval
--			     fi
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
- 
--fi;
--	echo "$as_me:$LINENO: checking for Subversion libraries" >&5
--echo $ECHO_N "checking for Subversion libraries... $ECHO_C" >&6
--	SVN_LIB=""
--	for VALUE in $SVN_LIBS ; do
--		if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>&1; then
--			SVN_LIB="-L$VALUE"
--			break
--		fi
--	done
--	if test $SVN_LIB ; then
--		echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
--	else
--		echo "$as_me:$LINENO: result: not found" >&5
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
 -echo "${ECHO_T}not found" >&6
--		SVN_SUBDIR=
--	fi
--fi
--SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1"
--SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
--SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
- 
--if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
--  { { echo "$as_me:$LINENO: error: --with-subversion was given, but test for subversion failed" >&5
--echo "$as_me: error: --with-subversion was given, but test for subversion failed" >&2;}
--   { (exit 1); exit 1; }; }
--fi
- fi
- 
- 
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
- 
-+   fi
- 
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
-+  { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-+echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-+  HELP_SUBDIR=
+   { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
+ echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
+@@ -34867,8 +37637,8 @@
+   DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
  
-+   else
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      XML_CONFIG=$kde_cv_path
+       XML_CONFIG=$kde_cv_path
  
--if test -n "$SVN_SUBDIR"; then
--  include_kioslave_svn_TRUE=
--  include_kioslave_svn_FALSE='#'
--else
--  include_kioslave_svn_TRUE='#'
--  include_kioslave_svn_FALSE=
--fi
-+   fi
+    fi
+@@ -34891,14 +37661,14 @@
+      LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
  
  
-+if test -n "$XML_CONFIG"; then
-+  vers=`$XML_CONFIG --version 2>/dev/null | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 2004008
-+  then
-+     LIBXML_LIBS="`$XML_CONFIG --libs`"
-+     LIBXML_RPATH=
-+     for args in $LIBXML_LIBS; do
-+	  case $args in
-+	    -L*)
-+  	       LIBXML_RPATH="$LIBXML_RPATH $args"
-+ 	       ;;
-+          esac
-+     done
-+     LIBXML_RPATH=`echo $LIBXML_RPATH | sed -e "s/-L/-R/g"`
-+     LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
- 
--case "$host" in
--   *-gnu)
--      saved_LIBS="$LIBS"
--      LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic"
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--int
--main ()
--{
+-   echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for xmllint" >&5
 +echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
-+   if test -n "$XMLLINT"; then
-+        kde_cv_path="$XMLLINT";
-+   else
-+        kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+    if test -n "$XMLLINT"; then
+         kde_cv_path="$XMLLINT";
+    else
+         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
  
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  kde_compile_kmtrace=$GCC
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
--kde_compile_kmtrace=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--      KMTRACE_LIBS=$LIBS
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin"
-+	fi
-+	IFS=$kde_save_IFS
+@@ -34941,12 +37711,12 @@
+    fi
  
--      LIBS="$saved_LIBS"
--      ;;
--   *)
--      kde_compile_kmtrace=no
--      ;;
--esac
-+        for dir in $dirs; do
-+	  if test -x "$dir/xmllint"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/xmllint  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/xmllint"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/xmllint"
-+                break
-+	    fi
-+          fi
-+        done
- 
--if test ! "x$kde_compile_kmtrace" = "xyes"; then
--   DO_NOT_COMPILE="$DO_NOT_COMPILE kmtrace"
--fi
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
- 
- 
-+fi
- 
-- 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'
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
- 
-+   fi
- 
--if test "${ac_cv_header_FlexLexer_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
--echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
--if test "${ac_cv_header_FlexLexer_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
--echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking FlexLexer.h usability" >&5
--echo $ECHO_N "checking FlexLexer.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <FlexLexer.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_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_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
-+      XMLLINT=""
-+   else
+       XMLLINT=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      XMLLINT=$kde_cv_path
+       XMLLINT=$kde_cv_path
  
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+   fi
+    fi
+@@ -34967,14 +37737,14 @@
+ if test "$HAVE_XSLT" = yes; then
  
--# Is the header present?
--echo "$as_me:$LINENO: checking FlexLexer.h presence" >&5
--echo $ECHO_N "checking FlexLexer.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <FlexLexer.h>
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XMLLINT "$XMLLINT"
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+
-   else
--    ac_cpp_err=
-+     { echo "$as_me:$LINENO: WARNING: You need at least libxml 2.4.8" >&5
-+echo "$as_me: WARNING: You need at least libxml 2.4.8" >&2;}
-+     HAVE_XSLT=no
-   fi
--else
--  ac_cpp_err=yes
- fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
  
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+if test "$HAVE_XSLT" = yes; then
- 
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: FlexLexer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: FlexLexer.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: FlexLexer.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: FlexLexer.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: FlexLexer.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: FlexLexer.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: FlexLexer.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: FlexLexer.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--echo "$as_me:$LINENO: checking for FlexLexer.h" >&5
--echo $ECHO_N "checking for FlexLexer.h... $ECHO_C" >&6
--if test "${ac_cv_header_FlexLexer_h+set}" = set; then
-+
+-   echo "$as_me:$LINENO: checking for xslt-config" >&5
+-echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6
 +   { echo "$as_me:$LINENO: checking for xslt-config" >&5
 +echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6; }
-+   if test -n "$XSLT_CONFIG"; then
-+        kde_cv_path="$XSLT_CONFIG";
-+   else
-+        kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
-+
+    if test -n "$XSLT_CONFIG"; then
+         kde_cv_path="$XSLT_CONFIG";
+    else
+         kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
 +        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  ac_cv_header_FlexLexer_h=$ac_header_preproc
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_FlexLexer_h" >&5
--echo "${ECHO_T}$ac_cv_header_FlexLexer_h" >&6
  
--fi
--if test $ac_cv_header_FlexLexer_h = yes; then
--  kde_have_flex=yes
--else
--  kde_have_flex=no
--fi
-+        kde_cv_path="NONE"
-+	kde_save_IFS=$IFS
-+	IFS=':'
-+	dirs=""
-+	for dir in $PATH; do
-+	  dirs="$dirs $dir"
-+	done
-+	if test -z ""; then  	  dirs="${prefix}/bin ${exec_prefix}/bin $dirs"
-+        else  	  dirs="$dirs ${prefix}/bin ${exec_prefix}/bin"
-+	fi
-+	IFS=$kde_save_IFS
-+
-+        for dir in $dirs; do
-+	  if test -x "$dir/xslt-config"; then
-+	    if test -n ""
-+	    then
-+              evalstr="$dir/xslt-config  2>&1 "
-+	      if eval $evalstr; then
-+                kde_cv_path="$dir/xslt-config"
-+                break
-+	      fi
-+            else
-+		kde_cv_path="$dir/xslt-config"
-+                break
-+	    fi
-+          fi
-+        done
+@@ -35017,8 +37787,8 @@
+    fi
  
-+        eval "kde_cv_path_$kde_cache=$kde_cv_path"
- 
- 
--if test "$kde_have_flex" = "no"; then
--  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
- fi
- 
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
-+      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
- 
-+   fi
- 
--for ac_func in setenv
--do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
-+   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
 +      { echo "$as_me:$LINENO: result: not found" >&5
 +echo "${ECHO_T}not found" >&6; }
  
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
-+    { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
-+echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-+    HAVE_XSLT=no
+     { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
+ echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
+@@ -35026,8 +37796,8 @@
+     DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+   else
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
 +      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 +echo "${ECHO_T}$kde_cv_path" >&6; }
-+      XSLT_CONFIG=$kde_cv_path
+       XSLT_CONFIG=$kde_cv_path
  
--#undef $ac_func
-+   fi
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
--#endif
- 
--int
--main ()
--{
--return f != $ac_func;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_var=yes"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  if test -n "$XSLT_CONFIG"; then
-+     vers=`$XSLT_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+     if test -n "$vers" && test "$vers" -ge 1000007; then
-+       LIBXSLT_LIBS="`$XSLT_CONFIG --libs`"
-+       LIBXSLT_RPATH=
-+       for args in $LIBXSLT_LIBS; do
-+	  case $args in
-+	    -L*)
-+  	       LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
-+ 	       ;;
-+          esac
-+       done
-+       LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | sed -e "s/-L/-R/g"`
-+       LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
- 
--eval "$as_ac_var=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
-+     else
-+       { echo "$as_me:$LINENO: WARNING: You need at least libxslt 1.0.7" >&5
-+echo "$as_me: WARNING: You need at least libxslt 1.0.7" >&2;}
-+       HAVE_XSLT=no
-+     fi
-+  fi
+    fi
+@@ -35090,8 +37860,8 @@
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
  
-+if test "$HAVE_XSLT" = no; then
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
- fi
--done
-+
-+
-+
-+
-+
-+
- 
- 
- 
-@@ -34976,8 +38037,8 @@
- fi
- 
  for i in $ac_topsubdirs; do
 -  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
 -echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
@@ -41372,7 +38872,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -34988,8 +38049,8 @@
+@@ -35102,8 +37872,8 @@
    else
      install_it="no"
    fi
@@ -41383,7 +38883,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -35201,245 +38262,247 @@
+@@ -35315,247 +38085,247 @@
    umbrello_SUBDIR_included_FALSE=
  fi
  
@@ -41726,32 +39226,33 @@
 -          ac_config_files="$ac_config_files umbrello/umbrello/dialogs/Makefile"
 +ac_config_files="$ac_config_files umbrello/umbrello/dialogs/Makefile"
  
--          ac_config_files="$ac_config_files umbrello/umbrello/headings/Makefile"
+-          ac_config_files="$ac_config_files umbrello/umbrello/docgenerators/Makefile"
 +ac_config_files="$ac_config_files umbrello/umbrello/docgenerators/Makefile"
  
--          ac_config_files="$ac_config_files umbrello/umbrello/pics/Makefile"
+-          ac_config_files="$ac_config_files umbrello/umbrello/headings/Makefile"
 +ac_config_files="$ac_config_files umbrello/umbrello/headings/Makefile"
  
--          ac_config_files="$ac_config_files umbrello/umbrello/refactoring/Makefile"
+-          ac_config_files="$ac_config_files umbrello/umbrello/pics/Makefile"
 +ac_config_files="$ac_config_files umbrello/umbrello/pics/Makefile"
  
--          ac_config_files="$ac_config_files kcachegrind/version.h"
+-          ac_config_files="$ac_config_files umbrello/umbrello/refactoring/Makefile"
 +ac_config_files="$ac_config_files umbrello/umbrello/refactoring/Makefile"
  
--          ac_config_files="$ac_config_files kcachegrind/kcachegrind.spec"
+-          ac_config_files="$ac_config_files kcachegrind/version.h"
 +ac_config_files="$ac_config_files kcachegrind/version.h"
  
--          ac_config_files="$ac_config_files kcachegrind/kcachegrind.lsm"
+-          ac_config_files="$ac_config_files kcachegrind/kcachegrind.spec"
 +ac_config_files="$ac_config_files kcachegrind/kcachegrind.spec"
  
--          ac_config_files="$ac_config_files kmtrace/kminspector"
+-          ac_config_files="$ac_config_files kcachegrind/kcachegrind.lsm"
 +ac_config_files="$ac_config_files kcachegrind/kcachegrind.lsm"
-+
+ 
+-          ac_config_files="$ac_config_files kmtrace/kminspector"
 +ac_config_files="$ac_config_files kmtrace/kminspector"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -35459,39 +38522,58 @@
+@@ -35575,39 +38345,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -41826,7 +39327,7 @@
    fi
  fi
  rm -f confcache
-@@ -35500,38 +38582,31 @@
+@@ -35616,38 +38405,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -41878,7 +39379,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -35766,11 +38841,35 @@
+@@ -35882,11 +38664,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -41916,7 +39417,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -35779,8 +38878,43 @@
+@@ -35895,8 +38701,43 @@
  fi
  
  
@@ -41961,7 +39462,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -35794,18 +38928,19 @@
+@@ -35910,18 +38751,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -41984,7 +39485,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -35813,159 +38948,120 @@
+@@ -35929,159 +38771,120 @@
  
  
  # Name of the executable.
@@ -42215,7 +39716,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -35974,7 +39070,19 @@
+@@ -36090,7 +38893,19 @@
    as_mkdir_p=false
  fi
  
@@ -42236,7 +39737,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -35983,31 +39091,14 @@
+@@ -36099,31 +38914,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -42272,7 +39773,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -36015,30 +39106,20 @@
+@@ -36131,30 +38929,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -42311,7 +39812,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -36046,7 +39127,7 @@
+@@ -36162,7 +38950,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -42320,7 +39821,7 @@
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -36065,19 +39146,21 @@
+@@ -36181,19 +38969,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -42348,7 +39849,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -36088,39 +39171,24 @@
+@@ -36204,39 +38994,24 @@
  do
    case $1 in
    --*=*)
@@ -42394,7 +39895,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -36130,18 +39198,24 @@
+@@ -36246,18 +39021,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -42424,7 +39925,7 @@
  
    esac
    shift
-@@ -36157,156 +39231,169 @@
+@@ -36273,157 +39054,169 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -42580,6 +40081,7 @@
 -  "umbrello/umbrello/codeimport/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codeimport/Makefile" ;;
 -  "umbrello/umbrello/codeimport/kdevcppparser/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/codeimport/kdevcppparser/Makefile" ;;
 -  "umbrello/umbrello/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/dialogs/Makefile" ;;
+-  "umbrello/umbrello/docgenerators/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/docgenerators/Makefile" ;;
 -  "umbrello/umbrello/headings/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/headings/Makefile" ;;
 -  "umbrello/umbrello/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/pics/Makefile" ;;
 -  "umbrello/umbrello/refactoring/Makefile" ) CONFIG_FILES="$CONFIG_FILES umbrello/umbrello/refactoring/Makefile" ;;
@@ -42724,7 +40226,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -36318,553 +39405,751 @@
+@@ -36435,559 +39228,751 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -43034,6 +40536,12 @@
 -s, at include_kioslave_svn_TRUE@,$include_kioslave_svn_TRUE,;t t
 -s, at include_kioslave_svn_FALSE@,$include_kioslave_svn_FALSE,;t t
 -s, at KMTRACE_LIBS@,$KMTRACE_LIBS,;t t
+-s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
+-s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
+-s, at LIBXSLT_RPATH@,$LIBXSLT_RPATH,;t t
+-s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
+-s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
+-s, at LIBXML_RPATH@,$LIBXML_RPATH,;t t
 -s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
 -s, at cervisia_SUBDIR_included_TRUE@,$cervisia_SUBDIR_included_TRUE,;t t
 -s, at cervisia_SUBDIR_included_FALSE@,$cervisia_SUBDIR_included_FALSE,;t t
@@ -43968,7 +41476,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -36872,248 +40157,130 @@
+@@ -36995,248 +39980,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -44317,7 +41825,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -37124,135 +40291,39 @@
+@@ -37247,135 +40114,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -44479,7 +41987,7 @@
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -37262,18 +40333,29 @@
+@@ -37385,18 +40156,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -44517,7 +42025,7 @@
    else
      continue
    fi
-@@ -37295,53 +40377,79 @@
+@@ -37418,53 +40200,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -44626,125 +42134,21 @@
  
  { (exit 0); exit 0; }
  _ACEOF
---- configure.files
-+++ configure.files
-@@ -9,3 +9,4 @@
- ./kioslave/svn/configure.in.in
- ./kmtrace/configure.in.in
- ./umbrello/configure.in.in
-+./umbrello/umbrello/docgenerators/configure.in.in
---- configure.in
-+++ configure.in
+diff -ur kdesdk-3.5.5.old/configure.in kdesdk-3.5.5/configure.in
+--- kdesdk-3.5.5.old/configure.in	2006-10-02 20:28:04.000000000 +0200
++++ kdesdk-3.5.5/configure.in	2006-10-10 00:57:48.000000000 +0200
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdesdk, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdesdk, "3.5.5") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -485,6 +487,90 @@
- dnl #endif
- dnl ])
- 
-+
-+AC_LANG_SAVE
-+AC_LANG_C
-+
-+AC_LANG_RESTORE
-+
-+
-+dnl =======================================================
-+dnl FILE: ./umbrello/umbrello/docgenerators/configure.in.in
-+dnl =======================================================
-+
-+
-+HAVE_XSLT=yes
-+
-+KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-+  AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)])
-+  HELP_SUBDIR=
-+])
-+
-+if test -n "$XML_CONFIG"; then
-+  vers=`$XML_CONFIG --version 2>/dev/null | sed -e 's/libxml //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+  if test -n "$vers" && test "$vers" -ge 2004008
-+  then
-+     LIBXML_LIBS="`$XML_CONFIG --libs`"
-+     LIBXML_RPATH=
-+     for args in $LIBXML_LIBS; do
-+	  case $args in
-+	    -L*)
-+  	       LIBXML_RPATH="$LIBXML_RPATH $args"
-+ 	       ;;
-+          esac
-+     done
-+     LIBXML_RPATH=`echo $LIBXML_RPATH | sed -e "s/-L/-R/g"`
-+     LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
-+
-+     KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
-+     AC_DEFINE_UNQUOTED(XMLLINT, "$XMLLINT", [Defines the executable of xmllint])
-+  else
-+     AC_MSG_WARN([You need at least libxml 2.4.8])
-+     HAVE_XSLT=no     
-+  fi
-+fi
-+
-+if test "$HAVE_XSLT" = yes; then
-+
-+  KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin], [
-+    AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)])
-+    HAVE_XSLT=no 
-+  ])
-+
-+  if test -n "$XSLT_CONFIG"; then
-+     vers=`$XSLT_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+     if test -n "$vers" && test "$vers" -ge 1000007; then
-+       LIBXSLT_LIBS="`$XSLT_CONFIG --libs`"
-+       LIBXSLT_RPATH=
-+       for args in $LIBXSLT_LIBS; do
-+	  case $args in
-+	    -L*)
-+  	       LIBXSLT_RPATH="$LIBXSLT_RPATH $args"
-+ 	       ;;
-+          esac
-+       done
-+       LIBXSLT_RPATH=`echo $LIBXSLT_RPATH | sed -e "s/-L/-R/g"`
-+       LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
-+
-+     else
-+       AC_MSG_WARN([You need at least libxslt 1.0.7])
-+       HAVE_XSLT=no
-+     fi
-+  fi
-+fi
-+
-+if test "$HAVE_XSLT" = no; then  
-+  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-+fi
-+
-+AC_SUBST(LIBXSLT_LIBS)
-+AC_SUBST(LIBXSLT_CFLAGS)
-+AC_SUBST(LIBXSLT_RPATH)
-+
-+AC_SUBST(LIBXML_LIBS)
-+AC_SUBST(LIBXML_CFLAGS)
-+AC_SUBST(LIBXML_RPATH)
-+
- KDE_CREATE_SUBDIRSLIST
- AM_CONDITIONAL(cervisia_SUBDIR_included, test "x$cervisia_SUBDIR_included" = xyes)
- AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
-@@ -619,6 +705,7 @@
- AC_CONFIG_FILES([ umbrello/umbrello/codeimport/Makefile ])
- AC_CONFIG_FILES([ umbrello/umbrello/codeimport/kdevcppparser/Makefile ])
- AC_CONFIG_FILES([ umbrello/umbrello/dialogs/Makefile ])
-+AC_CONFIG_FILES([ umbrello/umbrello/docgenerators/Makefile ])
- AC_CONFIG_FILES([ umbrello/umbrello/headings/Makefile ])
- AC_CONFIG_FILES([ umbrello/umbrello/pics/Makefile ])
- AC_CONFIG_FILES([ umbrello/umbrello/refactoring/Makefile ])
---- doc/cervisia/Makefile.in
-+++ doc/cervisia/Makefile.in
+diff -ur kdesdk-3.5.5.old/doc/cervisia/Makefile.in kdesdk-3.5.5/doc/cervisia/Makefile.in
+--- kdesdk-3.5.5.old/doc/cervisia/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/cervisia/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44753,20 +42157,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -44776,7 +42167,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -44796,7 +42187,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -44815,7 +42206,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -44833,7 +42224,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -44842,7 +42233,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/cervisia/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/cervisia/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/cervisia/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/cervisia/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/cervisia/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/cervisia/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/cervisia/Makefile
++	  $(AUTOMAKE) --gnu  doc/cervisia/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/cervisia/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -44854,45 +42269,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -542,10 +557,10 @@
- .NOEXPORT:
+@@ -605,9 +614,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/cervisia/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/cervisia/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/cervisia/Makefile
++	  $(AUTOMAKE) --gnu  doc/cervisia/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/cervisia/Makefile.in
  
- #>+ 2
--KDE_DIST=patch.png resolve.png diff.png index.docbook repositories.png popup.png commit.png index.cache.bz2 history.png logtree.png updatetag.png Makefile.in mainview.png import.png checkout.png Makefile.am annotate.png 
-+KDE_DIST=patch.png resolve.png diff.png index.docbook repositories.png popup.png commit.png index.cache.bz2 history.png logtree.png updatetag.png Makefile.in mainview.png checkout.png import.png Makefile.am annotate.png 
  
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) updatetag.png mainview.png patch.png resolve.png history.png logtree.png index.docbook popup.png checkout.png repositories.png commit.png diff.png annotate.png import.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) resolve.png logtree.png diff.png patch.png popup.png annotate.png history.png repositories.png mainview.png import.png updatetag.png checkout.png commit.png index.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -572,20 +587,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/cervisia
--	@for base in updatetag.png mainview.png patch.png resolve.png history.png logtree.png index.docbook popup.png checkout.png repositories.png commit.png diff.png annotate.png import.png ; do \
-+	@for base in resolve.png logtree.png diff.png patch.png popup.png annotate.png history.png repositories.png mainview.png import.png updatetag.png checkout.png commit.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/cervisia/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/cervisia/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in updatetag.png mainview.png patch.png resolve.png history.png logtree.png index.docbook popup.png checkout.png repositories.png commit.png diff.png annotate.png import.png ; do \
-+	for base in resolve.png logtree.png diff.png patch.png popup.png annotate.png history.png repositories.png mainview.png import.png updatetag.png checkout.png commit.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/cervisia/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in updatetag.png mainview.png patch.png resolve.png history.png logtree.png index.docbook popup.png checkout.png repositories.png commit.png diff.png annotate.png import.png ; do \
-+	for file in resolve.png logtree.png diff.png patch.png popup.png annotate.png history.png repositories.png mainview.png import.png updatetag.png checkout.png commit.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
---- doc/kapptemplate/Makefile.in
-+++ doc/kapptemplate/Makefile.in
+diff -ur kdesdk-3.5.5.old/doc/kapptemplate/Makefile.in kdesdk-3.5.5/doc/kapptemplate/Makefile.in
+--- kdesdk-3.5.5.old/doc/kapptemplate/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/kapptemplate/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44901,20 +42292,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -44924,7 +42302,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -44944,7 +42322,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -44963,7 +42341,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -44981,7 +42359,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -44990,7 +42368,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kapptemplate/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kapptemplate/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/kapptemplate/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/kapptemplate/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kapptemplate/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kapptemplate/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kapptemplate/Makefile
++	  $(AUTOMAKE) --gnu  doc/kapptemplate/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kapptemplate/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45002,8 +42404,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kbabel/Makefile.in
-+++ doc/kbabel/Makefile.in
+@@ -557,9 +566,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kapptemplate/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kapptemplate/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kapptemplate/Makefile
++	  $(AUTOMAKE) --gnu  doc/kapptemplate/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kapptemplate/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/doc/kbabel/Makefile.in kdesdk-3.5.5/doc/kbabel/Makefile.in
+--- kdesdk-3.5.5.old/doc/kbabel/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/kbabel/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45012,20 +42427,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45035,7 +42437,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45055,7 +42457,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45074,7 +42476,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45092,7 +42494,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -358,7 +373,7 @@
+@@ -364,7 +373,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45101,7 +42503,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -396,9 +411,9 @@
+@@ -373,9 +382,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kbabel/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kbabel/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/kbabel/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/kbabel/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -385,9 +394,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kbabel/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kbabel/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kbabel/Makefile
++	  $(AUTOMAKE) --gnu  doc/kbabel/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kbabel/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -402,9 +411,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45113,45 +42539,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -543,10 +558,10 @@
- .NOEXPORT:
+@@ -606,9 +615,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kbabel/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kbabel/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kbabel/Makefile
++	  $(AUTOMAKE) --gnu  doc/kbabel/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kbabel/Makefile.in
  
- #>+ 2
--KDE_DIST=prevfuzzyuntrans.png prevuntranslated.png pref_proj_file_commands.png snap_kbabeldict2.png pref_fonts.png forward.png editpaste.png undo.png filesave.png top.png index.docbook snap1.png catalogmanager_missing.png pref_wizard_page2.png catalogmanager_ok.png pref_proj_folder_commands.png glossary.docbook fileopen.png catalogmanager_reload.png bottom.png dictionaries.docbook preferences.docbook msgid2msgstr.png editcut.png nextuntranslated.png pref_proj_catman.png faq.docbook prevfuzzy.png pref_diff.png nexterror.png transsearch.png nextfuzzyuntrans.png pref_edit_general.png kbabeldict.docbook redo.png index.cache.bz2 next.png catalogmanager_broken.png pref_wizard_page1.png snap_kbabeldict.png pref_search.png using.docbook previous.png catalogmanager.png find.png catalogmanager_nopot.png pref_proj_source.png Makefile.in back.png catalogmanager_nopot_ok.png menu.docbook pref_proj_diff.png stop.png man-catalogmanager.1.docbook dbcan.png catalogmanager_needwork.png catman.docbook pref_edit_appearance.png editcopy.png Makefile.am snap_catalogmanager.png preverror.png roughtranslation.png nextfuzzy.png 
-+KDE_DIST=prevfuzzyuntrans.png prevuntranslated.png pref_proj_file_commands.png snap_kbabeldict2.png pref_fonts.png editpaste.png forward.png undo.png filesave.png top.png index.docbook snap1.png catalogmanager_missing.png pref_wizard_page2.png catalogmanager_ok.png glossary.docbook pref_proj_folder_commands.png fileopen.png catalogmanager_reload.png bottom.png dictionaries.docbook preferences.docbook msgid2msgstr.png editcut.png nextuntranslated.png pref_proj_catman.png faq.docbook prevfuzzy.png pref_diff.png nexterror.png transsearch.png nextfuzzyuntrans.png kbabeldict.docbook pref_edit_general.png redo.png next.png index.cache.bz2 catalogmanager_broken.png pref_wizard_page1.png snap_kbabeldict.png pref_search.png using.docbook previous.png catalogmanager.png find.png catalogmanager_nopot.png pref_proj_source.png back.png Makefile.in catalogmanager_nopot_ok.png menu.docbook stop.png pref_proj_diff.png man-catalogmanager.1.docbook dbcan.png catalogmanager_needwork.png catman.docbook pref_edit_appearance.png editcopy.png snap_catalogmanager.png Makefile.am roughtranslation.png preverror.png nextfuzzy.png 
  
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) snap_catalogmanager.png preferences.docbook catman.docbook undo.png catalogmanager_missing.png prevfuzzyuntrans.png fileopen.png editcut.png prevuntranslated.png index.docbook roughtranslation.png TODO catalogmanager_needwork.png catalogmanager.png snap_kbabeldict.png dbcan.png previous.png find.png man-catalogmanager.1.docbook kbabeldict.docbook using.docbook editpaste.png snap1.png prevfuzzy.png msgid2msgstr.png nextfuzzyuntrans.png nexterror.png redo.png filesave.png glossary.docbook catalogmanager_ok.png menu.docbook back.png faq.docbook top.png catalogmanager_nopot.png nextuntranslated.png forward.png bottom.png dictionaries.docbook catalogmanager_broken.png transsearch.png next.png catalogmanager_nopot_ok.png editcopy.png stop.png snap_kbabeldict2.png nextfuzzy.png preverror.png pref_proj_folder_commands.png catalogmanager_reload.png pref_proj_source.png pref_fonts.png pref_proj_file_commands.png pref_proj_catman.png pref_edit_appearance.png pref_search.png pref_diff.png pref_edit_general.png pref_proj_diff.png pref_wizard_page1.png pref_wizard_page2.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO undo.png preferences.docbook catman.docbook catalogmanager_needwork.png pref_search.png nextfuzzyuntrans.png transsearch.png catalogmanager_ok.png snap_kbabeldict2.png pref_edit_general.png pref_wizard_page1.png pref_wizard_page2.png prevfuzzyuntrans.png pref_diff.png pref_proj_file_commands.png catalogmanager_broken.png editcut.png catalogmanager_nopot.png filesave.png pref_proj_catman.png dbcan.png dictionaries.docbook find.png prevfuzzy.png nextuntranslated.png previous.png catalogmanager_nopot_ok.png kbabeldict.docbook pref_edit_appearance.png forward.png nextfuzzy.png snap_kbabeldict.png prevuntranslated.png man-catalogmanager.1.docbook msgid2msgstr.png top.png pref_proj_diff.png menu.docbook pref_proj_folder_commands.png catalogmanager_reload.png back.png faq.docbook pref_proj_source.png preverror.png next.png editcopy.png nexterror.png editpaste.png catalogmanager.png glossary.docbook fileopen.png catalogmanager_missing.png snap_catalogmanager.png roughtranslation.png stop.png index.docbook redo.png using.docbook pref_fonts.png bottom.png snap1.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -573,20 +588,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbabel
--	@for base in snap_catalogmanager.png preferences.docbook catman.docbook undo.png catalogmanager_missing.png prevfuzzyuntrans.png fileopen.png editcut.png prevuntranslated.png index.docbook roughtranslation.png TODO catalogmanager_needwork.png catalogmanager.png snap_kbabeldict.png dbcan.png previous.png find.png man-catalogmanager.1.docbook kbabeldict.docbook using.docbook editpaste.png snap1.png prevfuzzy.png msgid2msgstr.png nextfuzzyuntrans.png nexterror.png redo.png filesave.png glossary.docbook catalogmanager_ok.png menu.docbook back.png faq.docbook top.png catalogmanager_nopot.png nextuntranslated.png forward.png bottom.png dictionaries.docbook catalogmanager_broken.png transsearch.png next.png catalogmanager_nopot_ok.png editcopy.png stop.png snap_kbabeldict2.png nextfuzzy.png preverror.png pref_proj_folder_commands.png catalogmanager_reload.png pref_proj_source.png pref_fonts.png pref_proj_file_commands.png pref_proj_catman.png pref_edit_appearance.png pref_search.png pref_diff.png pref_edit_general.png pref_proj_diff.png pref_wizard_page1.png pref_wizard_page2.png ; do \
-+	@for base in TODO undo.png preferences.docbook catman.docbook catalogmanager_needwork.png pref_search.png nextfuzzyuntrans.png transsearch.png catalogmanager_ok.png snap_kbabeldict2.png pref_edit_general.png pref_wizard_page1.png pref_wizard_page2.png prevfuzzyuntrans.png pref_diff.png pref_proj_file_commands.png catalogmanager_broken.png editcut.png catalogmanager_nopot.png filesave.png pref_proj_catman.png dbcan.png dictionaries.docbook find.png prevfuzzy.png nextuntranslated.png previous.png catalogmanager_nopot_ok.png kbabeldict.docbook pref_edit_appearance.png forward.png nextfuzzy.png snap_kbabeldict.png prevuntranslated.png man-catalogmanager.1.docbook msgid2msgstr.png top.png pref_proj_diff.png menu.docbook pref_proj_folder_commands.png catalogmanager_reload.png back.png faq.docbook pref_proj_source.png preverror.png next.png editcopy.png nexterror.png editpaste.png catalogmanager.png glossary.docbook fileopen.png catalogmanager_missing.png snap_catalogmanager.png roughtranslation.png stop.png index.docbook redo.png using.docbook pref_fonts.png bottom.png snap1.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbabel/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbabel/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in snap_catalogmanager.png preferences.docbook catman.docbook undo.png catalogmanager_missing.png prevfuzzyuntrans.png fileopen.png editcut.png prevuntranslated.png index.docbook roughtranslation.png TODO catalogmanager_needwork.png catalogmanager.png snap_kbabeldict.png dbcan.png previous.png find.png man-catalogmanager.1.docbook kbabeldict.docbook using.docbook editpaste.png snap1.png prevfuzzy.png msgid2msgstr.png nextfuzzyuntrans.png nexterror.png redo.png filesave.png glossary.docbook catalogmanager_ok.png menu.docbook back.png faq.docbook top.png catalogmanager_nopot.png nextuntranslated.png forward.png bottom.png dictionaries.docbook catalogmanager_broken.png transsearch.png next.png catalogmanager_nopot_ok.png editcopy.png stop.png snap_kbabeldict2.png nextfuzzy.png preverror.png pref_proj_folder_commands.png catalogmanager_reload.png pref_proj_source.png pref_fonts.png pref_proj_file_commands.png pref_proj_catman.png pref_edit_appearance.png pref_search.png pref_diff.png pref_edit_general.png pref_proj_diff.png pref_wizard_page1.png pref_wizard_page2.png ; do \
-+	for base in TODO undo.png preferences.docbook catman.docbook catalogmanager_needwork.png pref_search.png nextfuzzyuntrans.png transsearch.png catalogmanager_ok.png snap_kbabeldict2.png pref_edit_general.png pref_wizard_page1.png pref_wizard_page2.png prevfuzzyuntrans.png pref_diff.png pref_proj_file_commands.png catalogmanager_broken.png editcut.png catalogmanager_nopot.png filesave.png pref_proj_catman.png dbcan.png dictionaries.docbook find.png prevfuzzy.png nextuntranslated.png previous.png catalogmanager_nopot_ok.png kbabeldict.docbook pref_edit_appearance.png forward.png nextfuzzy.png snap_kbabeldict.png prevuntranslated.png man-catalogmanager.1.docbook msgid2msgstr.png top.png pref_proj_diff.png menu.docbook pref_proj_folder_commands.png catalogmanager_reload.png back.png faq.docbook pref_proj_source.png preverror.png next.png editcopy.png nexterror.png editpaste.png catalogmanager.png glossary.docbook fileopen.png catalogmanager_missing.png snap_catalogmanager.png roughtranslation.png stop.png index.docbook redo.png using.docbook pref_fonts.png bottom.png snap1.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kbabel/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in snap_catalogmanager.png preferences.docbook catman.docbook undo.png catalogmanager_missing.png prevfuzzyuntrans.png fileopen.png editcut.png prevuntranslated.png index.docbook roughtranslation.png TODO catalogmanager_needwork.png catalogmanager.png snap_kbabeldict.png dbcan.png previous.png find.png man-catalogmanager.1.docbook kbabeldict.docbook using.docbook editpaste.png snap1.png prevfuzzy.png msgid2msgstr.png nextfuzzyuntrans.png nexterror.png redo.png filesave.png glossary.docbook catalogmanager_ok.png menu.docbook back.png faq.docbook top.png catalogmanager_nopot.png nextuntranslated.png forward.png bottom.png dictionaries.docbook catalogmanager_broken.png transsearch.png next.png catalogmanager_nopot_ok.png editcopy.png stop.png snap_kbabeldict2.png nextfuzzy.png preverror.png pref_proj_folder_commands.png catalogmanager_reload.png pref_proj_source.png pref_fonts.png pref_proj_file_commands.png pref_proj_catman.png pref_edit_appearance.png pref_search.png pref_diff.png pref_edit_general.png pref_proj_diff.png pref_wizard_page1.png pref_wizard_page2.png ; do \
-+	for file in TODO undo.png preferences.docbook catman.docbook catalogmanager_needwork.png pref_search.png nextfuzzyuntrans.png transsearch.png catalogmanager_ok.png snap_kbabeldict2.png pref_edit_general.png pref_wizard_page1.png pref_wizard_page2.png prevfuzzyuntrans.png pref_diff.png pref_proj_file_commands.png catalogmanager_broken.png editcut.png catalogmanager_nopot.png filesave.png pref_proj_catman.png dbcan.png dictionaries.docbook find.png prevfuzzy.png nextuntranslated.png previous.png catalogmanager_nopot_ok.png kbabeldict.docbook pref_edit_appearance.png forward.png nextfuzzy.png snap_kbabeldict.png prevuntranslated.png man-catalogmanager.1.docbook msgid2msgstr.png top.png pref_proj_diff.png menu.docbook pref_proj_folder_commands.png catalogmanager_reload.png back.png faq.docbook pref_proj_source.png preverror.png next.png editcopy.png nexterror.png editpaste.png catalogmanager.png glossary.docbook fileopen.png catalogmanager_missing.png snap_catalogmanager.png roughtranslation.png stop.png index.docbook redo.png using.docbook pref_fonts.png bottom.png snap1.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
---- doc/kbugbuster/Makefile.in
-+++ doc/kbugbuster/Makefile.in
+diff -ur kdesdk-3.5.5.old/doc/kbugbuster/Makefile.in kdesdk-3.5.5/doc/kbugbuster/Makefile.in
+--- kdesdk-3.5.5.old/doc/kbugbuster/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/kbugbuster/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45160,20 +42562,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45183,7 +42572,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45203,7 +42592,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45222,7 +42611,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45240,7 +42629,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45249,7 +42638,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kbugbuster/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kbugbuster/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/kbugbuster/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/kbugbuster/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kbugbuster/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kbugbuster/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kbugbuster/Makefile
++	  $(AUTOMAKE) --gnu  doc/kbugbuster/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kbugbuster/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45261,8 +42674,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kcachegrind/Makefile.in
-+++ doc/kcachegrind/Makefile.in
+@@ -605,9 +614,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kbugbuster/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kbugbuster/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kbugbuster/Makefile
++	  $(AUTOMAKE) --gnu  doc/kbugbuster/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kbugbuster/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/doc/kcachegrind/Makefile.in kdesdk-3.5.5/doc/kcachegrind/Makefile.in
+--- kdesdk-3.5.5.old/doc/kcachegrind/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/kcachegrind/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45271,20 +42697,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45294,7 +42707,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45314,7 +42727,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45333,7 +42746,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45351,7 +42764,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45360,7 +42773,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcachegrind/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kcachegrind/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/kcachegrind/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/kcachegrind/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcachegrind/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kcachegrind/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kcachegrind/Makefile
++	  $(AUTOMAKE) --gnu  doc/kcachegrind/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kcachegrind/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45372,8 +42809,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kompare/Makefile.in
-+++ doc/kompare/Makefile.in
+@@ -605,9 +614,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kcachegrind/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kcachegrind/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kcachegrind/Makefile
++	  $(AUTOMAKE) --gnu  doc/kcachegrind/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kcachegrind/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/doc/kompare/Makefile.in kdesdk-3.5.5/doc/kompare/Makefile.in
+--- kdesdk-3.5.5.old/doc/kompare/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/kompare/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45382,20 +42832,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45405,7 +42842,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45425,7 +42862,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45444,7 +42881,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45462,7 +42899,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45471,7 +42908,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kompare/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kompare/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/kompare/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/kompare/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kompare/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kompare/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kompare/Makefile
++	  $(AUTOMAKE) --gnu  doc/kompare/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kompare/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45483,8 +42944,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/Makefile.in
-+++ doc/Makefile.in
+@@ -605,9 +614,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/kompare/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/kompare/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/kompare/Makefile
++	  $(AUTOMAKE) --gnu  doc/kompare/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/kompare/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/doc/Makefile.in kdesdk-3.5.5/doc/Makefile.in
+--- kdesdk-3.5.5.old/doc/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45493,20 +42967,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45516,7 +42977,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45536,7 +42997,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45555,7 +43016,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45573,14 +43034,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -370,13 +385,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kbabel umbrello kcachegrind cervisia kapptemplate scripts kbugbuster kompare
-+SUBDIRS =. cervisia kompare kcachegrind scripts kbugbuster kapptemplate kbabel umbrello
- #>- all: all-recursive
- #>+ 1
+@@ -382,7 +391,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -45589,7 +43043,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -414,9 +429,9 @@
+@@ -391,9 +400,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -403,9 +412,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/Makefile
++	  $(AUTOMAKE) --gnu  doc/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -420,9 +429,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45601,8 +43079,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/scripts/kdesvn-build/Makefile.in
-+++ doc/scripts/kdesvn-build/Makefile.in
+@@ -724,9 +733,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/Makefile
++	  $(AUTOMAKE) --gnu  doc/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/doc/scripts/kdesvn-build/Makefile.in kdesdk-3.5.5/doc/scripts/kdesvn-build/Makefile.in
+--- kdesdk-3.5.5.old/doc/scripts/kdesvn-build/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/scripts/kdesvn-build/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45611,20 +43102,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45634,7 +43112,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45654,7 +43132,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45673,7 +43151,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45691,7 +43169,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45700,7 +43178,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/scripts/kdesvn-build/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/scripts/kdesvn-build/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/scripts/kdesvn-build/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/scripts/kdesvn-build/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/scripts/kdesvn-build/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/scripts/kdesvn-build/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/scripts/kdesvn-build/Makefile
++	  $(AUTOMAKE) --gnu  doc/scripts/kdesvn-build/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/scripts/kdesvn-build/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45712,8 +43214,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/scripts/Makefile.in
-+++ doc/scripts/Makefile.in
+@@ -605,9 +614,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/scripts/kdesvn-build/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/scripts/kdesvn-build/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/scripts/kdesvn-build/Makefile
++	  $(AUTOMAKE) --gnu  doc/scripts/kdesvn-build/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/scripts/kdesvn-build/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/doc/scripts/Makefile.in kdesdk-3.5.5/doc/scripts/Makefile.in
+--- kdesdk-3.5.5.old/doc/scripts/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/scripts/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45722,20 +43237,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45745,7 +43247,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45765,7 +43267,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45784,7 +43286,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45802,7 +43304,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -376,7 +391,7 @@
+@@ -382,7 +391,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -45811,7 +43313,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -414,9 +429,9 @@
+@@ -391,9 +400,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/scripts/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/scripts/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/scripts/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/scripts/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -403,9 +412,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/scripts/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/scripts/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/scripts/Makefile
++	  $(AUTOMAKE) --gnu  doc/scripts/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/scripts/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -420,9 +429,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45823,17 +43349,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -703,7 +718,7 @@
- .NOEXPORT:
+@@ -724,9 +733,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/scripts/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/scripts/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/scripts/Makefile
++	  $(AUTOMAKE) --gnu  doc/scripts/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/scripts/Makefile.in
  
- #>+ 2
--KDE_DIST=man-pruneemptydirs.1.docbook man-fixincludes.1.docbook man-cheatmake.1.docbook man-adddebug.1.docbook man-create_makefile.1.docbook man-cvslastchange.1.docbook man-cvsrevertlast.1.docbook man-create_cvsignore.1.docbook man-swappo.1.docbook man-split2po.1.docbook man-qtdoc.1.docbook man-demangle.1.docbook man-extractrc.1.docbook man-xml2pot.1.docbook man-zonetab2pot.1.docbook man-po2xml.1.docbook man-reportview.1.docbook man-cvscheck.1.docbook man-cxxmetric.1.docbook man-transxx.1.docbook Makefile.in man-create_makefiles.1.docbook man-extend_dmalloc.1.docbook man-cvslastlog.1.docbook Makefile.am 
-+KDE_DIST=man-pruneemptydirs.1.docbook man-fixincludes.1.docbook man-cheatmake.1.docbook man-adddebug.1.docbook man-create_makefile.1.docbook man-cvslastchange.1.docbook man-cvsrevertlast.1.docbook man-create_cvsignore.1.docbook man-swappo.1.docbook man-split2po.1.docbook man-qtdoc.1.docbook man-demangle.1.docbook man-extractrc.1.docbook man-xml2pot.1.docbook man-zonetab2pot.1.docbook man-po2xml.1.docbook man-reportview.1.docbook man-cvscheck.1.docbook man-cxxmetric.1.docbook man-transxx.1.docbook man-create_makefiles.1.docbook Makefile.in man-extend_dmalloc.1.docbook man-cvslastlog.1.docbook Makefile.am 
  
- #>+ 2
- docs-am:
---- doc/umbrello/Makefile.in
-+++ doc/umbrello/Makefile.in
+diff -ur kdesdk-3.5.5.old/doc/umbrello/Makefile.in kdesdk-3.5.5/doc/umbrello/Makefile.in
+--- kdesdk-3.5.5.old/doc/umbrello/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/doc/umbrello/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45842,20 +43372,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45865,7 +43382,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45885,7 +43402,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -45904,7 +43421,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -45922,7 +43439,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45931,7 +43448,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/umbrello/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/umbrello/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  doc/umbrello/Makefile
++#>- 	  $(AUTOMAKE) --gnu  doc/umbrello/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/umbrello/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/umbrello/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/umbrello/Makefile
++	  $(AUTOMAKE) --gnu  doc/umbrello/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/umbrello/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45943,45 +43484,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -542,10 +557,10 @@
- .NOEXPORT:
+@@ -605,9 +614,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/umbrello/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/umbrello/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/umbrello/Makefile
++	  $(AUTOMAKE) --gnu  doc/umbrello/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit doc/umbrello/Makefile.in
  
- #>+ 2
--KDE_DIST=uml_basics.docbook add-remove-languages.png class.png code-import.png association.png index.docbook state-diagram.png activity-diagram.png generation-options.png credits.docbook aggregation.png code_import_and_generation.docbook umbrello-main-screen.png sequence-diagram.png use-case-diagram.png index.cache.bz2 folders.png class-diagram.png umbrello-ui.png generalization.png umbrello-ui-clean.png collaboration-diagram.png Makefile.in other_features.docbook composition.png introduction.docbook working_with_umbrello.docbook authors.docbook Makefile.am 
-+KDE_DIST=uml_basics.docbook add-remove-languages.png class.png index.docbook association.png code-import.png state-diagram.png activity-diagram.png generation-options.png credits.docbook aggregation.png code_import_and_generation.docbook umbrello-main-screen.png use-case-diagram.png sequence-diagram.png index.cache.bz2 folders.png class-diagram.png umbrello-ui.png generalization.png umbrello-ui-clean.png collaboration-diagram.png other_features.docbook Makefile.in composition.png introduction.docbook working_with_umbrello.docbook authors.docbook Makefile.am 
  
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) activity-diagram.png umbrello-ui.png folders.png class-diagram.png code_import_and_generation.docbook composition.png index.docbook class.png other_features.docbook use-case-diagram.png sequence-diagram.png working_with_umbrello.docbook generalization.png introduction.docbook association.png collaboration-diagram.png umbrello-ui-clean.png uml_basics.docbook umbrello-main-screen.png authors.docbook code-import.png state-diagram.png generation-options.png aggregation.png add-remove-languages.png credits.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) working_with_umbrello.docbook code_import_and_generation.docbook generation-options.png folders.png uml_basics.docbook composition.png introduction.docbook class-diagram.png code-import.png add-remove-languages.png association.png umbrello-ui.png sequence-diagram.png other_features.docbook generalization.png aggregation.png use-case-diagram.png class.png umbrello-ui-clean.png activity-diagram.png authors.docbook collaboration-diagram.png index.docbook umbrello-main-screen.png credits.docbook state-diagram.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -572,20 +587,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/umbrello
--	@for base in activity-diagram.png umbrello-ui.png folders.png class-diagram.png code_import_and_generation.docbook composition.png index.docbook class.png other_features.docbook use-case-diagram.png sequence-diagram.png working_with_umbrello.docbook generalization.png introduction.docbook association.png collaboration-diagram.png umbrello-ui-clean.png uml_basics.docbook umbrello-main-screen.png authors.docbook code-import.png state-diagram.png generation-options.png aggregation.png add-remove-languages.png credits.docbook ; do \
-+	@for base in working_with_umbrello.docbook code_import_and_generation.docbook generation-options.png folders.png uml_basics.docbook composition.png introduction.docbook class-diagram.png code-import.png add-remove-languages.png association.png umbrello-ui.png sequence-diagram.png other_features.docbook generalization.png aggregation.png use-case-diagram.png class.png umbrello-ui-clean.png activity-diagram.png authors.docbook collaboration-diagram.png index.docbook umbrello-main-screen.png credits.docbook state-diagram.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/umbrello/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/umbrello/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in activity-diagram.png umbrello-ui.png folders.png class-diagram.png code_import_and_generation.docbook composition.png index.docbook class.png other_features.docbook use-case-diagram.png sequence-diagram.png working_with_umbrello.docbook generalization.png introduction.docbook association.png collaboration-diagram.png umbrello-ui-clean.png uml_basics.docbook umbrello-main-screen.png authors.docbook code-import.png state-diagram.png generation-options.png aggregation.png add-remove-languages.png credits.docbook ; do \
-+	for base in working_with_umbrello.docbook code_import_and_generation.docbook generation-options.png folders.png uml_basics.docbook composition.png introduction.docbook class-diagram.png code-import.png add-remove-languages.png association.png umbrello-ui.png sequence-diagram.png other_features.docbook generalization.png aggregation.png use-case-diagram.png class.png umbrello-ui-clean.png activity-diagram.png authors.docbook collaboration-diagram.png index.docbook umbrello-main-screen.png credits.docbook state-diagram.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/umbrello/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in activity-diagram.png umbrello-ui.png folders.png class-diagram.png code_import_and_generation.docbook composition.png index.docbook class.png other_features.docbook use-case-diagram.png sequence-diagram.png working_with_umbrello.docbook generalization.png introduction.docbook association.png collaboration-diagram.png umbrello-ui-clean.png uml_basics.docbook umbrello-main-screen.png authors.docbook code-import.png state-diagram.png generation-options.png aggregation.png add-remove-languages.png credits.docbook ; do \
-+	for file in working_with_umbrello.docbook code_import_and_generation.docbook generation-options.png folders.png uml_basics.docbook composition.png introduction.docbook class-diagram.png code-import.png add-remove-languages.png association.png umbrello-ui.png sequence-diagram.png other_features.docbook generalization.png aggregation.png use-case-diagram.png class.png umbrello-ui-clean.png activity-diagram.png authors.docbook collaboration-diagram.png index.docbook umbrello-main-screen.png credits.docbook state-diagram.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
---- kapptemplate/admin/acinclude.m4.in
-+++ kapptemplate/admin/acinclude.m4.in
+diff -ur kdesdk-3.5.5.old/kapptemplate/admin/acinclude.m4.in kdesdk-3.5.5/kapptemplate/admin/acinclude.m4.in
+--- kdesdk-3.5.5.old/kapptemplate/admin/acinclude.m4.in	2006-10-02 16:52:39.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/admin/acinclude.m4.in	2006-10-10 00:55:02.000000000 +0200
 @@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
@@ -46008,8 +43525,9 @@
  AC_TRY_COMPILE([
  $2
  ],
---- kapptemplate/admin/configure.in.min
-+++ kapptemplate/admin/configure.in.min
+diff -ur kdesdk-3.5.5.old/kapptemplate/admin/configure.in.min kdesdk-3.5.5/kapptemplate/admin/configure.in.min
+--- kdesdk-3.5.5.old/kapptemplate/admin/configure.in.min	2006-10-02 16:52:39.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/admin/configure.in.min	2006-10-10 00:55:02.000000000 +0200
 @@ -38,6 +38,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
@@ -46019,8 +43537,9 @@
  KDE_SET_PREFIX
  
  dnl generate the config header
---- kapptemplate/admin/install-sh
-+++ kapptemplate/admin/install-sh
+diff -ur kdesdk-3.5.5.old/kapptemplate/admin/install-sh kdesdk-3.5.5/kapptemplate/admin/install-sh
+--- kdesdk-3.5.5.old/kapptemplate/admin/install-sh	2006-10-02 16:52:39.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/admin/install-sh	2006-10-10 00:55:01.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -46310,8 +43829,9 @@
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
---- kapptemplate/admin/libtool.m4.in
-+++ kapptemplate/admin/libtool.m4.in
+diff -ur kdesdk-3.5.5.old/kapptemplate/admin/libtool.m4.in kdesdk-3.5.5/kapptemplate/admin/libtool.m4.in
+--- kdesdk-3.5.5.old/kapptemplate/admin/libtool.m4.in	2006-10-02 16:52:39.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/admin/libtool.m4.in	2006-10-10 00:55:01.000000000 +0200
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -50105,8 +47625,9 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- kapptemplate/admin/ltmain.sh
-+++ kapptemplate/admin/ltmain.sh
+diff -ur kdesdk-3.5.5.old/kapptemplate/admin/ltmain.sh kdesdk-3.5.5/kapptemplate/admin/ltmain.sh
+--- kdesdk-3.5.5.old/kapptemplate/admin/ltmain.sh	2006-10-02 16:52:39.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/admin/ltmain.sh	2006-10-10 00:55:01.000000000 +0200
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -54165,8 +51686,9 @@
  # ### END LIBTOOL TAG CONFIG: disable-static
  
  # Local Variables:
---- kapptemplate/admin/Makefile.in
-+++ kapptemplate/admin/Makefile.in
+diff -ur kdesdk-3.5.5.old/kapptemplate/admin/Makefile.in kdesdk-3.5.5/kapptemplate/admin/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/admin/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/admin/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -38,7 +38,9 @@
  host_triplet = @host@
  target_triplet = @target@
@@ -54186,20 +51708,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +145,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +182,9 @@
+@@ -179,6 +182,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54209,7 +51718,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +225,16 @@
+@@ -219,18 +225,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54229,7 +51738,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +255,18 @@
+@@ -251,14 +255,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -54248,7 +51757,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +333,17 @@
+@@ -325,14 +333,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -54266,7 +51775,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -355,7 +372,7 @@
+@@ -361,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54275,7 +51784,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -393,9 +410,9 @@
+@@ -370,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/admin/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/admin/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/admin/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/admin/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -382,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/admin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/admin/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/admin/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/admin/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/admin/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -399,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54287,7 +51820,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -546,7 +563,7 @@
+@@ -552,7 +563,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -54296,8 +51829,21 @@
  
  #>+ 2
  docs-am:
---- kapptemplate/admin/missing
-+++ kapptemplate/admin/missing
+@@ -567,9 +578,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/admin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/admin/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/admin/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/admin/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/admin/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/admin/missing kdesdk-3.5.5/kapptemplate/admin/missing
+--- kdesdk-3.5.5.old/kapptemplate/admin/missing	2006-10-02 16:52:39.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/admin/missing	2006-10-10 00:55:01.000000000 +0200
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -54358,8 +51904,9 @@
      touch $file
      ;;
  
---- kapptemplate/appframework/Makefile.in
-+++ kapptemplate/appframework/Makefile.in
+diff -ur kdesdk-3.5.5.old/kapptemplate/appframework/Makefile.in kdesdk-3.5.5/kapptemplate/appframework/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/appframework/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/appframework/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -121,6 +121,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54368,20 +51915,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -169,6 +170,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -200,6 +207,9 @@
+@@ -206,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54391,7 +51925,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -240,18 +250,16 @@
+@@ -246,18 +250,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54411,7 +51945,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -272,14 +280,18 @@
+@@ -278,14 +280,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -54430,7 +51964,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -346,14 +358,17 @@
+@@ -352,14 +358,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -54448,7 +51982,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -388,7 +403,7 @@
+@@ -394,7 +403,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -54457,7 +51991,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -426,9 +441,9 @@
+@@ -403,9 +412,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/appframework/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/appframework/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/appframework/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/appframework/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -415,9 +424,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/appframework/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/appframework/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/appframework/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/appframework/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/appframework/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -432,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54469,8 +52027,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/appframework/no-exe/Makefile.in
-+++ kapptemplate/appframework/no-exe/Makefile.in
+@@ -757,9 +766,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/appframework/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/appframework/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/appframework/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/appframework/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/appframework/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/appframework/no-exe/Makefile.in kdesdk-3.5.5/kapptemplate/appframework/no-exe/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/appframework/no-exe/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/appframework/no-exe/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -105,6 +105,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54479,20 +52050,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -153,6 +154,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -184,6 +191,9 @@
+@@ -190,6 +191,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54502,7 +52060,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -224,18 +234,16 @@
+@@ -230,18 +234,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54522,7 +52080,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -256,14 +264,18 @@
+@@ -262,14 +264,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -54541,7 +52099,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -330,14 +342,17 @@
+@@ -336,14 +342,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -54559,7 +52117,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -368,7 +383,7 @@
+@@ -374,7 +383,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54568,7 +52126,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -406,9 +421,9 @@
+@@ -383,9 +392,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/appframework/no-exe/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/appframework/no-exe/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/appframework/no-exe/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/appframework/no-exe/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -395,9 +404,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/appframework/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/appframework/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/appframework/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/appframework/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/appframework/no-exe/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -412,9 +421,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54580,8 +52162,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/existing/Makefile.in
-+++ kapptemplate/existing/Makefile.in
+@@ -589,9 +598,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/appframework/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/appframework/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/appframework/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/appframework/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/appframework/no-exe/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/existing/Makefile.in kdesdk-3.5.5/kapptemplate/existing/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/existing/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/existing/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54590,20 +52185,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54613,7 +52195,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54633,7 +52215,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -54652,7 +52234,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -54670,7 +52252,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -367,7 +382,7 @@
+@@ -373,7 +382,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54679,7 +52261,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -405,9 +420,9 @@
+@@ -382,9 +391,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/existing/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/existing/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/existing/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/existing/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -394,9 +403,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/existing/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/existing/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/existing/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/existing/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/existing/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -411,9 +420,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54691,8 +52297,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/kapp/Makefile.in
-+++ kapptemplate/kapp/Makefile.in
+@@ -588,9 +597,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/existing/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/existing/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/existing/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/existing/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/existing/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/kapp/Makefile.in kdesdk-3.5.5/kapptemplate/kapp/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/kapp/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/kapp/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -120,6 +120,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54701,20 +52320,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,6 +169,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -199,6 +206,9 @@
+@@ -205,6 +206,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54724,7 +52330,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -239,18 +249,16 @@
+@@ -245,18 +249,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54744,7 +52350,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -271,14 +279,18 @@
+@@ -277,14 +279,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -54763,7 +52369,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -345,14 +357,17 @@
+@@ -351,14 +357,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -54781,7 +52387,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -390,7 +405,7 @@
+@@ -396,7 +405,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -54790,7 +52396,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -428,9 +443,9 @@
+@@ -405,9 +414,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kapp/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kapp/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/kapp/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/kapp/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kapp/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kapp/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kapp/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kapp/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kapp/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -434,9 +443,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54802,8 +52432,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/kapp/no-exe/Makefile.in
-+++ kapptemplate/kapp/no-exe/Makefile.in
+@@ -759,9 +768,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kapp/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kapp/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kapp/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kapp/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kapp/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/kapp/no-exe/Makefile.in kdesdk-3.5.5/kapptemplate/kapp/no-exe/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/kapp/no-exe/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/kapp/no-exe/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54812,20 +52455,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54835,7 +52465,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54855,7 +52485,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -54874,7 +52504,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -54892,7 +52522,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -369,7 +384,7 @@
+@@ -375,7 +384,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54901,7 +52531,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -407,9 +422,9 @@
+@@ -384,9 +393,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kapp/no-exe/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kapp/no-exe/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/kapp/no-exe/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/kapp/no-exe/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -396,9 +405,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kapp/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kapp/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kapp/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kapp/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kapp/no-exe/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +422,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54913,8 +52567,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/kpartapp/Makefile.in
-+++ kapptemplate/kpartapp/Makefile.in
+@@ -589,9 +598,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kapp/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kapp/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kapp/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kapp/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kapp/no-exe/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/kpartapp/Makefile.in kdesdk-3.5.5/kapptemplate/kpartapp/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/kpartapp/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/kpartapp/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -120,6 +120,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54923,20 +52590,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,6 +169,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -199,6 +206,9 @@
+@@ -205,6 +206,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54946,7 +52600,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -239,18 +249,16 @@
+@@ -245,18 +249,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54966,7 +52620,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -271,14 +279,18 @@
+@@ -277,14 +279,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -54985,7 +52639,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -345,14 +357,17 @@
+@@ -351,14 +357,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55003,7 +52657,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -391,7 +406,7 @@
+@@ -397,7 +406,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -55012,7 +52666,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -429,9 +444,9 @@
+@@ -406,9 +415,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartapp/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartapp/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/kpartapp/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/kpartapp/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartapp/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartapp/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartapp/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartapp/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartapp/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -435,9 +444,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55024,8 +52702,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/kpartapp/no-exe/Makefile.in
-+++ kapptemplate/kpartapp/no-exe/Makefile.in
+@@ -760,9 +769,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartapp/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartapp/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartapp/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartapp/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartapp/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/kpartapp/no-exe/Makefile.in kdesdk-3.5.5/kapptemplate/kpartapp/no-exe/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/kpartapp/no-exe/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/kpartapp/no-exe/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55034,20 +52725,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55057,7 +52735,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55077,7 +52755,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55096,7 +52774,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55114,7 +52792,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -369,7 +384,7 @@
+@@ -375,7 +384,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55123,7 +52801,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -407,9 +422,9 @@
+@@ -384,9 +393,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartapp/no-exe/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartapp/no-exe/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/kpartapp/no-exe/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/kpartapp/no-exe/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -396,9 +405,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartapp/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartapp/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartapp/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartapp/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartapp/no-exe/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +422,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55135,8 +52837,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/kpartplugin/Makefile.in
-+++ kapptemplate/kpartplugin/Makefile.in
+@@ -590,9 +599,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartapp/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartapp/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartapp/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartapp/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartapp/no-exe/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/kpartplugin/Makefile.in kdesdk-3.5.5/kapptemplate/kpartplugin/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/kpartplugin/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/kpartplugin/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -120,6 +120,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55145,20 +52860,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -168,6 +169,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -199,6 +206,9 @@
+@@ -205,6 +206,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55168,7 +52870,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -239,18 +249,16 @@
+@@ -245,18 +249,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55188,7 +52890,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -271,14 +279,18 @@
+@@ -277,14 +279,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55207,7 +52909,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -345,14 +357,17 @@
+@@ -351,14 +357,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55225,7 +52927,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -386,7 +401,7 @@
+@@ -392,7 +401,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -55234,7 +52936,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -424,9 +439,9 @@
+@@ -401,9 +410,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -413,9 +422,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartplugin/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -430,9 +439,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55246,8 +52972,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/kpartplugin/no-exe/Makefile.in
-+++ kapptemplate/kpartplugin/no-exe/Makefile.in
+@@ -755,9 +764,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartplugin/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/kpartplugin/no-exe/Makefile.in kdesdk-3.5.5/kapptemplate/kpartplugin/no-exe/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/kpartplugin/no-exe/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/kpartplugin/no-exe/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55256,20 +52995,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55279,7 +53005,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55299,7 +53025,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55318,7 +53044,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55336,7 +53062,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -367,7 +382,7 @@
+@@ -373,7 +382,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55345,7 +53071,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -405,9 +420,9 @@
+@@ -382,9 +391,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/no-exe/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/no-exe/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/no-exe/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/no-exe/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -394,9 +403,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartplugin/no-exe/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -411,9 +420,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55357,8 +53107,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kapptemplate/Makefile.in
-+++ kapptemplate/Makefile.in
+@@ -588,9 +597,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/no-exe/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/no-exe/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/kpartplugin/no-exe/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/kpartplugin/no-exe/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/kpartplugin/no-exe/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kapptemplate/Makefile.in kdesdk-3.5.5/kapptemplate/Makefile.in
+--- kdesdk-3.5.5.old/kapptemplate/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kapptemplate/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -126,6 +126,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55367,20 +53130,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -174,6 +175,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -205,6 +212,9 @@
+@@ -211,6 +212,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55390,7 +53140,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -245,18 +255,16 @@
+@@ -251,18 +255,16 @@
  VERSION := `cat $(srcdir)/VERSION`
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55410,7 +53160,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -277,14 +285,18 @@
+@@ -283,14 +285,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55429,7 +53179,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -351,14 +363,17 @@
+@@ -357,14 +363,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55447,7 +53197,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -395,7 +410,7 @@
+@@ -401,7 +410,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -55456,7 +53206,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -433,9 +448,9 @@
+@@ -410,9 +419,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kapptemplate/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kapptemplate/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -422,9 +431,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -439,9 +448,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55468,8 +53242,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
---- kbabel/addons/kfile-plugins/Makefile.in
-+++ kbabel/addons/kfile-plugins/Makefile.in
+@@ -812,9 +821,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kapptemplate/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kapptemplate/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kapptemplate/Makefile
++	  $(AUTOMAKE) --gnu  kapptemplate/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kapptemplate/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/addons/kfile-plugins/Makefile.in kdesdk-3.5.5/kbabel/addons/kfile-plugins/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/addons/kfile-plugins/Makefile.in	2006-10-02 20:29:22.000000000 +0200
++++ kdesdk-3.5.5/kbabel/addons/kfile-plugins/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55478,20 +53265,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55501,7 +53275,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55521,7 +53295,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55540,7 +53314,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55558,7 +53332,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -418,7 +433,7 @@
+@@ -424,7 +433,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -55567,7 +53341,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -456,9 +471,9 @@
+@@ -433,9 +442,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/addons/kfile-plugins/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/addons/kfile-plugins/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/addons/kfile-plugins/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/addons/kfile-plugins/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -445,9 +454,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/addons/kfile-plugins/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/addons/kfile-plugins/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/addons/kfile-plugins/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/addons/kfile-plugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/addons/kfile-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -462,9 +471,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55579,8 +53377,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/addons/Makefile.in
-+++ kbabel/addons/Makefile.in
+@@ -783,9 +792,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/addons/kfile-plugins/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/addons/kfile-plugins/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/addons/kfile-plugins/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/addons/kfile-plugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/addons/kfile-plugins/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/addons/Makefile.in kdesdk-3.5.5/kbabel/addons/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/addons/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kbabel/addons/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55589,20 +53400,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55612,7 +53410,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55632,7 +53430,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55651,7 +53449,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55669,7 +53467,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -373,7 +388,7 @@
+@@ -379,7 +388,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -55678,7 +53476,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -411,9 +426,9 @@
+@@ -417,9 +426,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55690,8 +53488,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kbabel/addons/preview/Makefile.in
-+++ kbabel/addons/preview/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/addons/preview/Makefile.in kdesdk-3.5.5/kbabel/addons/preview/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/addons/preview/Makefile.in	2006-10-02 20:29:22.000000000 +0200
++++ kdesdk-3.5.5/kbabel/addons/preview/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -139,6 +139,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55700,20 +53499,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,6 +188,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -218,6 +225,9 @@
+@@ -224,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55723,7 +53509,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -258,18 +268,16 @@
+@@ -264,18 +268,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55743,7 +53529,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +298,18 @@
+@@ -296,14 +298,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55762,7 +53548,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +376,17 @@
+@@ -370,14 +376,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55780,7 +53566,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -410,7 +425,7 @@
+@@ -416,7 +425,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -55789,7 +53575,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +463,9 @@
+@@ -425,9 +434,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/addons/preview/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/addons/preview/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/addons/preview/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/addons/preview/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -437,9 +446,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/addons/preview/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/addons/preview/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/addons/preview/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/addons/preview/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/addons/preview/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -454,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55801,8 +53611,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/catalogmanager/icons/Makefile.in
-+++ kbabel/catalogmanager/icons/Makefile.in
+@@ -761,9 +770,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/addons/preview/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/addons/preview/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/addons/preview/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/addons/preview/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/addons/preview/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/catalogmanager/icons/Makefile.in kdesdk-3.5.5/kbabel/catalogmanager/icons/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/catalogmanager/icons/Makefile.in	2006-10-02 20:29:22.000000000 +0200
++++ kdesdk-3.5.5/kbabel/catalogmanager/icons/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -55811,20 +53634,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55834,7 +53644,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55854,7 +53664,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -55873,7 +53683,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -55891,7 +53701,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -361,7 +376,7 @@
+@@ -367,7 +376,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55900,7 +53710,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -399,9 +414,9 @@
+@@ -376,9 +385,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/icons/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/icons/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/icons/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/icons/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -388,9 +397,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/icons/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/icons/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/icons/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/icons/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/icons/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -405,9 +414,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55912,182 +53746,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -544,105 +559,105 @@
- .NOEXPORT:
+@@ -660,9 +669,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/icons/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/icons/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/icons/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/icons/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/icons/Makefile.in
  
- #>+ 2
--KDE_DIST=lo32-action-nextmarked.png hi16-action-prevmarked.png lo16-action-syntax.png hi32-action-nextmarked.png lo16-action-nexttemplate.png hi22-action-nextmarked.png hi32-action-prevpo.png hi22-action-nexttemplate.png lo16-action-statistics.png hi16-action-nextmarked.png hi22-action-prevpo.png lo16-action-nextmarked.png hi16-action-prevtemplate.png lo32-action-statistics.png hi16-action-statistics.png hi22-action-statistics.png lo16-action-prevpo.png hi22-action-prevtemplate.png hi32-action-statistics.png hi32-action-prevmarked.png hi22-action-syntax.png hi32-action-nexttemplate.png hi16-action-prevpo.png lo16-action-nextpo.png lo32-action-prevpo.png lo32-action-nexttemplate.png hi32-action-prevtemplate.png lo16-action-prevmarked.png lo32-action-prevtemplate.png lo16-action-prevtemplate.png lo22-action-statistics.png Makefile.in lo32-action-syntax.png hi16-action-nexttemplate.png lo22-action-syntax.png hi32-action-nextpo.png hi22-action-nextpo.png hi16-action-nextpo.png lo32-action-nextpo.png hi16-action-syntax.png hi32-action-syntax.png Makefile.am hi22-action-prevmarked.png lo32-action-prevmarked.png 
-+KDE_DIST=lo32-action-nextmarked.png hi16-action-prevmarked.png lo16-action-syntax.png hi32-action-nextmarked.png lo16-action-nexttemplate.png hi22-action-nextmarked.png hi32-action-prevpo.png hi22-action-nexttemplate.png lo16-action-statistics.png hi22-action-prevpo.png hi16-action-nextmarked.png lo16-action-nextmarked.png hi16-action-prevtemplate.png lo32-action-statistics.png hi16-action-statistics.png hi22-action-statistics.png lo16-action-prevpo.png hi22-action-prevtemplate.png hi32-action-statistics.png hi32-action-prevmarked.png hi22-action-syntax.png hi32-action-nexttemplate.png hi16-action-prevpo.png lo16-action-nextpo.png lo32-action-prevpo.png lo32-action-nexttemplate.png hi32-action-prevtemplate.png lo16-action-prevmarked.png lo32-action-prevtemplate.png lo16-action-prevtemplate.png lo22-action-statistics.png Makefile.in lo32-action-syntax.png hi16-action-nexttemplate.png lo22-action-syntax.png hi32-action-nextpo.png hi22-action-nextpo.png hi16-action-nextpo.png lo32-action-nextpo.png hi16-action-syntax.png hi32-action-syntax.png Makefile.am hi22-action-prevmarked.png lo32-action-prevmarked.png 
  
- #>+ 2
- docs-am:
- 
- #>+ 94
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/lo16-action-nextmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png
- 	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/lo32-action-nexttemplate.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexttemplate.png
--	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/hi22-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/syntax.png
- 	$(INSTALL_DATA) $(srcdir)/lo32-action-prevpo.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevpo.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexttemplate.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-prevpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevpo.png
- 	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/hi32-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png
-+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexttemplate.png
- 	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png
-+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/syntax.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-nextpo.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextpo.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-nextmarked.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextmarked.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextpo.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-prevtemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/statistics.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-nexttemplate.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexttemplate.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevmarked.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevpo.png
- 	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/lo22-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/22x22/actions/syntax.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/22x22/actions/statistics.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextpo.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextmarked.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevpo.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-prevpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevpo.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-nextmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/syntax.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextmarked.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevtemplate.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevpo.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevmarked.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png
- 	$(INSTALL_DATA) $(srcdir)/hi32-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextpo.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextpo.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-nextpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png
- 	$(INSTALL_DATA) $(srcdir)/lo32-action-prevtemplate.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevtemplate.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-prevtemplate.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-nextpo.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextpo.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexttemplate.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-syntax.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/syntax.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-nextpo.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-prevmarked.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-prevmarked.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevmarked.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/syntax.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextmarked.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-syntax.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png
--	$(INSTALL_DATA) $(srcdir)/lo22-action-statistics.png $(DESTDIR)$(iconsdir)/locolor/22x22/actions/statistics.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-nextmarked.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-prevtemplate.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexttemplate.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevpo.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-nexttemplate.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-nextpo.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextpo.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-nextmarked.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextmarked.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-prevpo.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-statistics.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexttemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/syntax.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexttemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevpo.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/syntax.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/statistics.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexttemplate.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevpo.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/22x22/actions/syntax.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/22x22/actions/statistics.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/syntax.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/statistics.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevtemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexttemplate.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevtemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevpo.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextpo.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevtemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevtemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/syntax.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexttemplate.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/syntax.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextpo.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/statistics.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevmarked.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/statistics.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/syntax.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/syntax.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/22x22/actions/statistics.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevtemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexttemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevpo.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexttemplate.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextpo.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextmarked.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevpo.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/statistics.png
- 
- #>+ 15
- force-reedit:
---- kbabel/catalogmanager/libcvs/Makefile.in
-+++ kbabel/catalogmanager/libcvs/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/catalogmanager/libcvs/Makefile.in kdesdk-3.5.5/kbabel/catalogmanager/libcvs/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/catalogmanager/libcvs/Makefile.in	2006-10-02 20:29:22.000000000 +0200
++++ kdesdk-3.5.5/kbabel/catalogmanager/libcvs/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -131,6 +131,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -56096,20 +53769,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -179,6 +180,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -210,6 +217,9 @@
+@@ -216,6 +217,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56119,7 +53779,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -250,18 +260,16 @@
+@@ -256,18 +260,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56139,7 +53799,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -282,14 +290,18 @@
+@@ -288,14 +290,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -56158,7 +53818,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -356,14 +368,17 @@
+@@ -362,14 +368,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -56176,7 +53836,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -402,7 +417,7 @@
+@@ -408,7 +417,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -56185,7 +53845,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -440,9 +455,9 @@
+@@ -417,9 +426,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/libcvs/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/libcvs/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/libcvs/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/libcvs/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -429,9 +438,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/libcvs/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/libcvs/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/libcvs/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/libcvs/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libcvs/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56197,47 +53881,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -672,22 +687,22 @@
- .NOEXPORT:
+@@ -711,9 +720,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/libcvs/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/libcvs/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/libcvs/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/libcvs/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libcvs/Makefile.in
  
- #>+ 3
--cvsdialog.moc: $(srcdir)/cvsdialog.h
--	$(MOC) $(srcdir)/cvsdialog.h -o cvsdialog.moc
-+cvshandler.moc: $(srcdir)/cvshandler.h
-+	$(MOC) $(srcdir)/cvshandler.h -o cvshandler.moc
  
- #>+ 2
--mocs: cvsdialog.moc
-+mocs: cvshandler.moc
- 
- #>+ 3
--cvshandler.moc: $(srcdir)/cvshandler.h
--	$(MOC) $(srcdir)/cvshandler.h -o cvshandler.moc
-+cvsdialog.moc: $(srcdir)/cvsdialog.h
-+	$(MOC) $(srcdir)/cvsdialog.h -o cvsdialog.moc
- 
- #>+ 2
--mocs: cvshandler.moc
-+mocs: cvsdialog.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  cvsdialog.moc cvshandler.moc
-+	-rm -f  cvshandler.moc cvsdialog.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am 
-@@ -734,7 +749,7 @@
- 
- 
- #>+ 11
--libcatalogmanagercvs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cvshandler.cpp $(srcdir)/cvsdialog.cpp  cvshandler.moc cvsdialog.moc
-+libcatalogmanagercvs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cvshandler.cpp $(srcdir)/cvsdialog.cpp  cvsdialog.moc cvshandler.moc
- 	@echo 'creating libcatalogmanagercvs_la.all_cpp.cpp ...'; \
- 	rm -f libcatalogmanagercvs_la.all_cpp.files libcatalogmanagercvs_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libcatalogmanagercvs_la.all_cpp.final; \
---- kbabel/catalogmanager/libsvn/Makefile.in
-+++ kbabel/catalogmanager/libsvn/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/catalogmanager/libsvn/Makefile.in kdesdk-3.5.5/kbabel/catalogmanager/libsvn/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/catalogmanager/libsvn/Makefile.in	2006-10-02 20:29:22.000000000 +0200
++++ kdesdk-3.5.5/kbabel/catalogmanager/libsvn/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -131,6 +131,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -56246,20 +53904,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -179,6 +180,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -210,6 +217,9 @@
+@@ -216,6 +217,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56269,7 +53914,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -250,18 +260,16 @@
+@@ -256,18 +260,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56289,7 +53934,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -282,14 +290,18 @@
+@@ -288,14 +290,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -56308,7 +53953,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -356,14 +368,17 @@
+@@ -362,14 +368,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -56326,7 +53971,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -402,7 +417,7 @@
+@@ -408,7 +417,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -56335,7 +53980,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -440,9 +455,9 @@
+@@ -417,9 +426,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/libsvn/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/libsvn/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/libsvn/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/libsvn/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -429,9 +438,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/libsvn/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/libsvn/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/libsvn/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/libsvn/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libsvn/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56347,8 +54016,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kbabel/catalogmanager/Makefile.in
-+++ kbabel/catalogmanager/Makefile.in
+@@ -711,9 +720,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/libsvn/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/libsvn/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/libsvn/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/libsvn/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/libsvn/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/catalogmanager/Makefile.in kdesdk-3.5.5/kbabel/catalogmanager/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/catalogmanager/Makefile.in	2006-10-02 20:29:22.000000000 +0200
++++ kdesdk-3.5.5/kbabel/catalogmanager/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -174,6 +174,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -56357,20 +54039,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -222,6 +223,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -253,6 +260,9 @@
+@@ -259,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56380,7 +54049,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -293,18 +303,16 @@
+@@ -299,18 +303,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56400,7 +54069,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -325,14 +333,18 @@
+@@ -331,14 +333,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -56419,7 +54088,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -399,14 +411,17 @@
+@@ -405,14 +411,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -56437,7 +54106,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -493,7 +508,7 @@
+@@ -499,7 +508,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -56446,7 +54115,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +546,9 @@
+@@ -508,9 +517,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -520,9 +529,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -537,9 +546,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56458,116 +54151,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -954,6 +969,11 @@
+@@ -1085,9 +1094,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/catalogmanager/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/catalogmanager/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/catalogmanager/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/catalogmanager/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/catalogmanager/Makefile.in
  
- distclean-local:
- 	rm -r -f API
-+
-+#>- catalogmanager.lo: ../common/version.h
-+#>+ 1
-+catalogmanager.lo: catalogmanager.moc  ../common/version.h
-+main.o: ../common/version.h
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-@@ -981,18 +1001,18 @@
- mocs: findinfilesdialog.moc
  
- #>+ 3
--markpatterndialog.moc: $(srcdir)/markpatterndialog.h
--	$(MOC) $(srcdir)/markpatterndialog.h -o markpatterndialog.moc
-+catalogmanagerview.moc: $(srcdir)/catalogmanagerview.h
-+	$(MOC) $(srcdir)/catalogmanagerview.h -o catalogmanagerview.moc
- 
- #>+ 2
--mocs: markpatterndialog.moc
-+mocs: catalogmanagerview.moc
- 
- #>+ 3
--catalogmanagerview.moc: $(srcdir)/catalogmanagerview.h
--	$(MOC) $(srcdir)/catalogmanagerview.h -o catalogmanagerview.moc
-+markpatterndialog.moc: $(srcdir)/markpatterndialog.h
-+	$(MOC) $(srcdir)/markpatterndialog.h -o markpatterndialog.moc
- 
- #>+ 2
--mocs: catalogmanagerview.moc
-+mocs: markpatterndialog.moc
- 
- #>+ 3
- multiroughtransdlg.moc: $(srcdir)/multiroughtransdlg.h
-@@ -1017,7 +1037,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  findinfilesdialog.moc markpatterndialog.moc catalogmanagerview.moc multiroughtransdlg.moc validateprogress.moc catalogmanager.moc
-+	-rm -f  findinfilesdialog.moc catalogmanagerview.moc markpatterndialog.moc multiroughtransdlg.moc validateprogress.moc catalogmanager.moc
- 
- #>+ 2
- KDE_DIST=hi16-app-catalogmanager.png lo32-app-catalogmanager.png markpatterndialog.h validationoptions.ui validateprogresswidget.ui.h hi22-app-catalogmanager.png future.cpp markpatternwidget.ui catalogmanagerui.rc catalogmanager.desktop hi48-app-catalogmanager.png lo16-app-catalogmanager.png Makefile.in validateprogresswidget.ui validateprogress.h hi32-app-catalogmanager.png Makefile.am 
-@@ -1043,26 +1063,26 @@
- 
- #>+ 22
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/catalogmanager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/catalogmanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/catalogmanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/lo16-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/catalogmanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/catalogmanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/catalogmanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/lo32-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/catalogmanager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/lo16-app-catalogmanager.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/catalogmanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/catalogmanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/catalogmanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/catalogmanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/catalogmanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/catalogmanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/catalogmanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/catalogmanager.png
- 
- #>+ 15
- force-reedit:
-@@ -1103,7 +1123,7 @@
- 
- 
- #>+ 11
--libcatalogmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/catalogmanagerview.cpp $(srcdir)/catalogmanager.cpp $(srcdir)/findinfilesdialog.cpp $(srcdir)/catmanlistitem.cpp $(srcdir)/multiroughtransdlg.cpp $(srcdir)/validateprogress.cpp $(srcdir)/markpatterndialog.cpp catalogmanageriface_skel.cpp validationoptions.cpp validateprogresswidget.cpp markpatternwidget.cpp  catalogmanagerview.moc validationoptions.moc findinfilesdialog.moc markpatterndialog.moc validateprogresswidget.moc multiroughtransdlg.moc markpatternwidget.moc validateprogress.moc catalogmanager.moc
-+libcatalogmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/catalogmanagerview.cpp $(srcdir)/catalogmanager.cpp  ../common/version.h $(srcdir)/findinfilesdialog.cpp $(srcdir)/catmanlistitem.cpp $(srcdir)/multiroughtransdlg.cpp $(srcdir)/validateprogress.cpp $(srcdir)/markpatterndialog.cpp catalogmanageriface_skel.cpp validationoptions.cpp validateprogresswidget.cpp markpatternwidget.cpp  catalogmanagerview.moc validationoptions.moc findinfilesdialog.moc markpatterndialog.moc validateprogresswidget.moc multiroughtransdlg.moc markpatternwidget.moc validateprogress.moc catalogmanager.moc
- 	@echo 'creating libcatalogmanager_la.all_cpp.cpp ...'; \
- 	rm -f libcatalogmanager_la.all_cpp.files libcatalogmanager_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libcatalogmanager_la.all_cpp.final; \
-@@ -1138,7 +1158,7 @@
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 22
-+#>+ 21
- multiroughtransdlg.lo: multiroughtransdlg.moc 
- $(srcdir)/multiroughtransdlg.cpp: validationoptions.h validateprogresswidget.h markpatternwidget.h 
- catalogmanagerview.lo: catalogmanagerview.moc 
-@@ -1153,7 +1173,6 @@
- $(srcdir)/catalogmanagerview.cpp: validationoptions.h validateprogresswidget.h markpatternwidget.h 
- findinfilesdialog.lo: findinfilesdialog.moc 
- $(srcdir)/markpatterndialog.cpp: validationoptions.h validateprogresswidget.h markpatternwidget.h 
--catalogmanager.lo: catalogmanager.moc 
- markpatterndialog.o: markpatterndialog.moc 
- catalogmanager.o: catalogmanager.moc 
- validateprogress.lo: validateprogress.moc 
---- kbabel/common/libgettext/Makefile.in
-+++ kbabel/common/libgettext/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/common/libgettext/Makefile.in kdesdk-3.5.5/kbabel/common/libgettext/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/common/libgettext/Makefile.in	2006-10-02 20:29:23.000000000 +0200
++++ kdesdk-3.5.5/kbabel/common/libgettext/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -132,6 +132,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -56576,20 +54174,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -180,6 +181,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -211,6 +218,9 @@
+@@ -217,6 +218,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56599,7 +54184,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -251,18 +261,16 @@
+@@ -257,18 +261,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56619,7 +54204,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -283,14 +291,18 @@
+@@ -289,14 +291,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -56638,7 +54223,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -357,14 +369,17 @@
+@@ -363,14 +369,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -56656,7 +54241,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -398,7 +413,7 @@
+@@ -404,7 +413,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -56665,7 +54250,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +451,9 @@
+@@ -413,9 +422,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/common/libgettext/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/common/libgettext/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/common/libgettext/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/common/libgettext/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -425,9 +434,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/common/libgettext/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/common/libgettext/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/common/libgettext/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/common/libgettext/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/common/libgettext/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -442,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56677,8 +54286,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kbabel/common/Makefile.in
-+++ kbabel/common/Makefile.in
+@@ -692,9 +701,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/common/libgettext/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/common/libgettext/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/common/libgettext/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/common/libgettext/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/common/libgettext/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/common/Makefile.in kdesdk-3.5.5/kbabel/common/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/common/Makefile.in	2006-10-02 20:29:23.000000000 +0200
++++ kdesdk-3.5.5/kbabel/common/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -168,6 +168,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -56687,20 +54309,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -216,6 +217,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -247,6 +254,9 @@
+@@ -253,6 +254,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56710,7 +54319,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -287,18 +297,16 @@
+@@ -293,18 +297,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56730,7 +54339,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -319,14 +327,18 @@
+@@ -325,14 +327,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -56749,7 +54358,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -393,14 +405,17 @@
+@@ -399,14 +405,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -56767,7 +54376,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -491,7 +506,7 @@
+@@ -497,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -56776,7 +54385,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +544,9 @@
+@@ -506,9 +515,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/common/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/common/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/common/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/common/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -518,9 +527,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/common/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/common/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/common/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/common/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/common/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -535,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56788,42 +54421,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1012,18 +1027,18 @@
- mocs: kbproject.moc
+@@ -1074,9 +1083,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/common/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/common/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/common/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/common/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/common/Makefile.in
  
- #>+ 3
--kbabeldatatool.moc.cpp: $(srcdir)/kbabeldatatool.h
--	$(MOC) $(srcdir)/kbabeldatatool.h -o kbabeldatatool.moc.cpp
-+msgfmt.moc: $(srcdir)/msgfmt.h
-+	$(MOC) $(srcdir)/msgfmt.h -o msgfmt.moc
  
- #>+ 2
--mocs: kbabeldatatool.moc.cpp
-+mocs: msgfmt.moc
- 
- #>+ 3
--msgfmt.moc: $(srcdir)/msgfmt.h
--	$(MOC) $(srcdir)/msgfmt.h -o msgfmt.moc
-+kbabeldatatool.moc.cpp: $(srcdir)/kbabeldatatool.h
-+	$(MOC) $(srcdir)/kbabeldatatool.h -o kbabeldatatool.moc.cpp
- 
- #>+ 2
--mocs: msgfmt.moc
-+mocs: kbabeldatatool.moc.cpp
- 
- #>+ 3
- catalog.moc: $(srcdir)/catalog.h
-@@ -1041,7 +1056,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kbproject.moc kbabeldatatool.moc.cpp msgfmt.moc catalog.moc catalogfileplugin.moc
-+	-rm -f  kbproject.moc msgfmt.moc kbabeldatatool.moc.cpp catalog.moc catalogfileplugin.moc
- 
- #>+ 2
- KDE_DIST=kbprojectsettings.kcfg kbabelfilter.desktop kbprojectsettings.kcfgc kbabel-projectrename.upd importplugin_private.h diff.h Makefile.in pluralforms.h argextractor.h Makefile.am 
---- kbabel/commonui/Makefile.in
-+++ kbabel/commonui/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/commonui/Makefile.in kdesdk-3.5.5/kbabel/commonui/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/commonui/Makefile.in	2006-10-02 20:29:23.000000000 +0200
++++ kdesdk-3.5.5/kbabel/commonui/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -148,6 +148,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -56832,20 +54444,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -196,6 +197,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -227,6 +234,9 @@
+@@ -233,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56855,7 +54454,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -267,18 +277,16 @@
+@@ -273,18 +277,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56875,7 +54474,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -299,14 +307,18 @@
+@@ -305,14 +307,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -56894,7 +54493,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -373,14 +385,17 @@
+@@ -379,14 +385,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -56912,7 +54511,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -456,7 +471,7 @@
+@@ -462,7 +471,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -56921,7 +54520,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -494,9 +509,9 @@
+@@ -471,9 +480,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/commonui/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/commonui/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/commonui/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/commonui/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -483,9 +492,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/commonui/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/commonui/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/commonui/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/commonui/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/commonui/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -500,9 +509,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56933,100 +54556,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -750,6 +765,16 @@
- 	tags uninstall uninstall-am uninstall-info-am \
- 	uninstall-kde_servicetypesDATA
+@@ -868,9 +877,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/commonui/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/commonui/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/commonui/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/commonui/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/commonui/Makefile.in
  
-+
-+#>- context.lo: ../common/kbprojectsettings.h
-+#>+ 1
-+context.lo: context.moc  ../common/kbprojectsettings.h
-+#>- projectpref.lo: ../common/kbprojectsettings.h
-+#>+ 1
-+projectpref.lo: projectpref.moc  ../common/kbprojectsettings.h
-+#>- projectprefwidgets.lo: ../common/kbprojectsettings.h
-+#>+ 1
-+projectprefwidgets.lo: projectprefwidgets.moc  ../common/kbprojectsettings.h
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-@@ -783,13 +808,6 @@
- mocs: kactionselector.moc
  
- #>+ 3
--projectprefwidgets.moc: $(srcdir)/projectprefwidgets.h
--	$(MOC) $(srcdir)/projectprefwidgets.h -o projectprefwidgets.moc
--
--#>+ 2
--mocs: projectprefwidgets.moc
--
--#>+ 3
- toolaction.moc: $(srcdir)/toolaction.h
- 	$(MOC) $(srcdir)/toolaction.h -o toolaction.moc
- 
-@@ -804,6 +822,13 @@
- mocs: context.moc
- 
- #>+ 3
-+projectprefwidgets.moc: $(srcdir)/projectprefwidgets.h
-+	$(MOC) $(srcdir)/projectprefwidgets.h -o projectprefwidgets.moc
-+
-+#>+ 2
-+mocs: projectprefwidgets.moc
-+
-+#>+ 3
- projectwizard.moc: $(srcdir)/projectwizard.h
- 	$(MOC) $(srcdir)/projectwizard.h -o projectwizard.moc
- 
-@@ -826,7 +851,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  roughtransdlg.moc cmdedit.moc finddialog.moc kactionselector.moc projectprefwidgets.moc toolaction.moc context.moc projectwizard.moc projectpref.moc toolselectionwidget.moc
-+	-rm -f  roughtransdlg.moc cmdedit.moc finddialog.moc kactionselector.moc toolaction.moc context.moc projectprefwidgets.moc projectwizard.moc projectpref.moc toolselectionwidget.moc
- 
- #>+ 2
- KDE_DIST=klisteditor.ui.h diffpreferences.ui projectwizardwidget.ui klisteditor.ui toolselectionwidget.h projectwizardwidget.ui.h kbabel_tool.desktop diffpreferences.ui.h Makefile.in kbabel_validator.desktop toolaction.h Makefile.am projectwizardwidget2.ui 
-@@ -881,7 +906,7 @@
- 
- 
- #>+ 11
--libkbabelcommonui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/context.cpp $(srcdir)/kactionselector.cpp $(srcdir)/toolselectionwidget.cpp $(srcdir)/toolaction.cpp $(srcdir)/finddialog.cpp $(srcdir)/roughtransdlg.cpp $(srcdir)/projectprefwidgets.cpp $(srcdir)/projectpref.cpp $(srcdir)/projectwizard.cpp $(srcdir)/cmdedit.cpp klisteditor.cpp projectwizardwidget.cpp projectwizardwidget2.cpp diffpreferences.cpp  roughtransdlg.moc cmdedit.moc finddialog.moc diffpreferences.moc projectwizardwidget.moc kactionselector.moc context.moc toolaction.moc projectprefwidgets.moc projectwizard.moc klisteditor.moc projectpref.moc toolselectionwidget.moc projectwizardwidget2.moc
-+libkbabelcommonui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/context.cpp  ../common/kbprojectsettings.h $(srcdir)/kactionselector.cpp $(srcdir)/toolselectionwidget.cpp $(srcdir)/toolaction.cpp $(srcdir)/finddialog.cpp $(srcdir)/roughtransdlg.cpp $(srcdir)/projectprefwidgets.cpp  ../common/kbprojectsettings.h $(srcdir)/projectpref.cpp  ../common/kbprojectsettings.h $(srcdir)/projectwizard.cpp $(srcdir)/cmdedit.cpp klisteditor.cpp projectwizardwidget.cpp projectwizardwidget2.cpp diffpreferences.cpp  roughtransdlg.moc cmdedit.moc finddialog.moc diffpreferences.moc projectwizardwidget.moc kactionselector.moc projectprefwidgets.moc context.moc toolaction.moc projectwizard.moc klisteditor.moc projectpref.moc toolselectionwidget.moc projectwizardwidget2.moc
- 	@echo 'creating libkbabelcommonui_la.all_cpp.cpp ...'; \
- 	rm -f libkbabelcommonui_la.all_cpp.files libkbabelcommonui_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkbabelcommonui_la.all_cpp.final; \
-@@ -916,19 +941,17 @@
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 33
-+#>+ 30
- roughtransdlg.o: roughtransdlg.moc 
- roughtransdlg.lo: roughtransdlg.moc 
- kactionselector.o: kactionselector.moc 
- $(srcdir)/projectwizard.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h 
- $(srcdir)/roughtransdlg.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h 
--projectprefwidgets.lo: projectprefwidgets.moc 
- $(srcdir)/projectprefwidgets.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h 
- $(srcdir)/projectpref.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h 
- cmdedit.lo: cmdedit.moc 
- nmcheck-am: nmcheck
- toolselectionwidget.lo: toolselectionwidget.moc 
--context.lo: context.moc 
- kactionselector.lo: kactionselector.moc 
- projectwizard.o: projectwizard.moc 
- toolaction.lo: toolaction.moc 
-@@ -946,7 +969,6 @@
- $(srcdir)/cmdedit.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h 
- projectprefwidgets.o: projectprefwidgets.moc 
- toolselectionwidget.o: toolselectionwidget.moc 
--projectpref.lo: projectpref.moc 
- cmdedit.o: cmdedit.moc 
- $(srcdir)/finddialog.cpp: klisteditor.h projectwizardwidget.h projectwizardwidget2.h diffpreferences.h 
- 
---- kbabel/datatools/accelerators/Makefile.in
-+++ kbabel/datatools/accelerators/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/accelerators/Makefile.in kdesdk-3.5.5/kbabel/datatools/accelerators/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/accelerators/Makefile.in	2006-10-02 20:29:23.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/accelerators/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57035,20 +54579,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57058,7 +54589,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57078,7 +54609,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57097,7 +54628,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57115,7 +54646,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -416,7 +431,7 @@
+@@ -422,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -57124,7 +54655,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +469,9 @@
+@@ -431,9 +440,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/accelerators/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/accelerators/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/accelerators/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/accelerators/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/accelerators/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/accelerators/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/accelerators/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/accelerators/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/accelerators/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57136,8 +54691,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/arguments/Makefile.in
-+++ kbabel/datatools/arguments/Makefile.in
+@@ -778,9 +787,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/accelerators/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/accelerators/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/accelerators/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/accelerators/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/accelerators/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/arguments/Makefile.in kdesdk-3.5.5/kbabel/datatools/arguments/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/arguments/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/arguments/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57146,20 +54714,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57169,7 +54724,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57189,7 +54744,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57208,7 +54763,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57226,7 +54781,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -416,7 +431,7 @@
+@@ -422,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -57235,7 +54790,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +469,9 @@
+@@ -431,9 +440,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/arguments/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/arguments/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/arguments/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/arguments/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/arguments/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/arguments/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/arguments/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/arguments/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/arguments/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57247,8 +54826,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/context/Makefile.in
-+++ kbabel/datatools/context/Makefile.in
+@@ -778,9 +787,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/arguments/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/arguments/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/arguments/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/arguments/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/arguments/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/context/Makefile.in kdesdk-3.5.5/kbabel/datatools/context/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/context/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/context/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57257,20 +54849,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57280,7 +54859,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57300,7 +54879,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57319,7 +54898,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57337,7 +54916,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -416,7 +431,7 @@
+@@ -422,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -57346,7 +54925,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +469,9 @@
+@@ -431,9 +440,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/context/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/context/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/context/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/context/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/context/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/context/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/context/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/context/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/context/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57358,8 +54961,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/equations/Makefile.in
-+++ kbabel/datatools/equations/Makefile.in
+@@ -778,9 +787,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/context/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/context/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/context/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/context/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/context/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/equations/Makefile.in kdesdk-3.5.5/kbabel/datatools/equations/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/equations/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/equations/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -142,6 +142,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57368,20 +54984,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -221,6 +228,9 @@
+@@ -227,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57391,7 +54994,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -261,18 +271,16 @@
+@@ -267,18 +271,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57411,7 +55014,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +301,18 @@
+@@ -299,14 +301,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57430,7 +55033,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +379,17 @@
+@@ -373,14 +379,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57448,7 +55051,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -417,7 +432,7 @@
+@@ -423,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -57457,7 +55060,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +470,9 @@
+@@ -432,9 +441,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/equations/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/equations/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/equations/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/equations/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/equations/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/equations/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/equations/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/equations/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/equations/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -461,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57469,8 +55096,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/length/Makefile.in
-+++ kbabel/datatools/length/Makefile.in
+@@ -779,9 +788,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/equations/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/equations/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/equations/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/equations/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/equations/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/length/Makefile.in kdesdk-3.5.5/kbabel/datatools/length/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/length/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/length/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57479,20 +55119,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57502,7 +55129,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57522,7 +55149,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57541,7 +55168,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57559,7 +55186,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -416,7 +431,7 @@
+@@ -422,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -57568,7 +55195,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +469,9 @@
+@@ -431,9 +440,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/length/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/length/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/length/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/length/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/length/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/length/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/length/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/length/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/length/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57580,8 +55231,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/Makefile.in
-+++ kbabel/datatools/Makefile.in
+@@ -778,9 +787,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/length/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/length/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/length/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/length/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/length/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/Makefile.in kdesdk-3.5.5/kbabel/datatools/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/Makefile.in	2006-10-02 20:29:23.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57590,20 +55254,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57613,7 +55264,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57633,7 +55284,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57652,7 +55303,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57670,7 +55321,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -398,7 +413,7 @@
+@@ -404,7 +413,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -57679,7 +55330,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +451,9 @@
+@@ -413,9 +422,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -425,9 +434,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -442,9 +451,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57691,8 +55366,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kbabel/datatools/not-translated/Makefile.in
-+++ kbabel/datatools/not-translated/Makefile.in
+@@ -756,9 +765,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/not-translated/Makefile.in kdesdk-3.5.5/kbabel/datatools/not-translated/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/not-translated/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/not-translated/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -142,6 +142,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57701,20 +55389,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -221,6 +228,9 @@
+@@ -227,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57724,7 +55399,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -261,18 +271,16 @@
+@@ -267,18 +271,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57744,7 +55419,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +301,18 @@
+@@ -299,14 +301,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57763,7 +55438,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +379,17 @@
+@@ -373,14 +379,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57781,7 +55456,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -417,7 +432,7 @@
+@@ -423,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -57790,7 +55465,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +470,9 @@
+@@ -432,9 +441,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/not-translated/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/not-translated/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/not-translated/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/not-translated/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/not-translated/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/not-translated/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/not-translated/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/not-translated/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/not-translated/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -461,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57802,8 +55501,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/pluralforms/Makefile.in
-+++ kbabel/datatools/pluralforms/Makefile.in
+@@ -779,9 +788,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/not-translated/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/not-translated/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/not-translated/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/not-translated/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/not-translated/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/pluralforms/Makefile.in kdesdk-3.5.5/kbabel/datatools/pluralforms/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/pluralforms/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/pluralforms/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57812,20 +55524,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57835,7 +55534,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57855,7 +55554,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57874,7 +55573,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -57892,7 +55591,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -416,7 +431,7 @@
+@@ -422,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -57901,7 +55600,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +469,9 @@
+@@ -431,9 +440,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/pluralforms/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/pluralforms/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/pluralforms/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/pluralforms/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/pluralforms/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/pluralforms/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/pluralforms/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/pluralforms/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/pluralforms/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57913,8 +55636,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/punctuation/Makefile.in
-+++ kbabel/datatools/punctuation/Makefile.in
+@@ -778,9 +787,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/pluralforms/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/pluralforms/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/pluralforms/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/pluralforms/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/pluralforms/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/punctuation/Makefile.in kdesdk-3.5.5/kbabel/datatools/punctuation/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/punctuation/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/punctuation/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -142,6 +142,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -57923,20 +55659,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -221,6 +228,9 @@
+@@ -227,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57946,7 +55669,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -261,18 +271,16 @@
+@@ -267,18 +271,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57966,7 +55689,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +301,18 @@
+@@ -299,14 +301,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -57985,7 +55708,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +379,17 @@
+@@ -373,14 +379,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58003,7 +55726,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -417,7 +432,7 @@
+@@ -423,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -58012,7 +55735,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +470,9 @@
+@@ -432,9 +441,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/punctuation/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/punctuation/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/punctuation/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/punctuation/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/punctuation/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/punctuation/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/punctuation/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/punctuation/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/punctuation/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -461,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58024,8 +55771,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/regexp/Makefile.in
-+++ kbabel/datatools/regexp/Makefile.in
+@@ -779,9 +788,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/punctuation/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/punctuation/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/punctuation/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/punctuation/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/punctuation/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/regexp/Makefile.in kdesdk-3.5.5/kbabel/datatools/regexp/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/regexp/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/regexp/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -142,6 +142,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58034,20 +55794,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -221,6 +228,9 @@
+@@ -227,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58057,7 +55804,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -261,18 +271,16 @@
+@@ -267,18 +271,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58077,7 +55824,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +301,18 @@
+@@ -299,14 +301,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58096,7 +55843,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +379,17 @@
+@@ -373,14 +379,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58114,7 +55861,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -419,7 +434,7 @@
+@@ -425,7 +434,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -58123,7 +55870,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -457,9 +472,9 @@
+@@ -434,9 +443,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/regexp/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/regexp/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/regexp/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/regexp/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -446,9 +455,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/regexp/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/regexp/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/regexp/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/regexp/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/regexp/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -463,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58135,8 +55906,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/setfuzzy/Makefile.in
-+++ kbabel/datatools/setfuzzy/Makefile.in
+@@ -800,9 +809,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/regexp/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/regexp/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/regexp/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/regexp/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/regexp/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/setfuzzy/Makefile.in kdesdk-3.5.5/kbabel/datatools/setfuzzy/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/setfuzzy/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/setfuzzy/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -139,6 +139,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58145,20 +55929,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,6 +188,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -218,6 +225,9 @@
+@@ -224,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58168,7 +55939,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -258,18 +268,16 @@
+@@ -264,18 +268,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58188,7 +55959,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +298,18 @@
+@@ -296,14 +298,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58207,7 +55978,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +376,17 @@
+@@ -370,14 +376,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58225,7 +55996,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -414,7 +429,7 @@
+@@ -420,7 +429,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -58234,7 +56005,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +467,9 @@
+@@ -429,9 +438,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/setfuzzy/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/setfuzzy/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/setfuzzy/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/setfuzzy/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -441,9 +450,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/setfuzzy/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/setfuzzy/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/setfuzzy/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/setfuzzy/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/setfuzzy/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -458,9 +467,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58246,8 +56041,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/whitespace/Makefile.in
-+++ kbabel/datatools/whitespace/Makefile.in
+@@ -776,9 +785,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/setfuzzy/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/setfuzzy/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/setfuzzy/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/setfuzzy/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/setfuzzy/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/whitespace/Makefile.in kdesdk-3.5.5/kbabel/datatools/whitespace/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/whitespace/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/whitespace/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -142,6 +142,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58256,20 +56064,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -190,6 +191,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -221,6 +228,9 @@
+@@ -227,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58279,7 +56074,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -261,18 +271,16 @@
+@@ -267,18 +271,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58299,7 +56094,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -293,14 +301,18 @@
+@@ -299,14 +301,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58318,7 +56113,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -367,14 +379,17 @@
+@@ -373,14 +379,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58336,7 +56131,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -417,7 +432,7 @@
+@@ -423,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -58345,7 +56140,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +470,9 @@
+@@ -432,9 +441,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/whitespace/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/whitespace/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/whitespace/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/whitespace/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/whitespace/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/whitespace/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/whitespace/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/whitespace/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/whitespace/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -461,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58357,8 +56176,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/datatools/xml/Makefile.in
-+++ kbabel/datatools/xml/Makefile.in
+@@ -779,9 +788,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/whitespace/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/whitespace/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/whitespace/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/whitespace/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/whitespace/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/datatools/xml/Makefile.in kdesdk-3.5.5/kbabel/datatools/xml/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/datatools/xml/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/datatools/xml/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58367,20 +56199,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58390,7 +56209,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58410,7 +56229,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58429,7 +56248,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58447,7 +56266,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -416,7 +431,7 @@
+@@ -422,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -58456,7 +56275,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +469,9 @@
+@@ -431,9 +440,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/xml/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/xml/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/datatools/xml/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/datatools/xml/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/xml/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/xml/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/xml/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/xml/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/xml/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58468,8 +56311,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/filters/gettext/Makefile.in
-+++ kbabel/filters/gettext/Makefile.in
+@@ -778,9 +787,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/datatools/xml/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/datatools/xml/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/datatools/xml/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/datatools/xml/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/datatools/xml/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/filters/gettext/Makefile.in kdesdk-3.5.5/kbabel/filters/gettext/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/filters/gettext/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/filters/gettext/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -149,6 +149,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58478,20 +56334,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -197,6 +198,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -228,6 +235,9 @@
+@@ -234,6 +235,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58501,7 +56344,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -268,18 +278,16 @@
+@@ -274,18 +278,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58521,7 +56364,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,14 +308,18 @@
+@@ -306,14 +308,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58540,7 +56383,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -374,14 +386,17 @@
+@@ -380,14 +386,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58558,7 +56401,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -422,7 +437,7 @@
+@@ -428,7 +437,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -58567,7 +56410,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +475,9 @@
+@@ -437,9 +446,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/gettext/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/gettext/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/filters/gettext/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/filters/gettext/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -449,9 +458,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/gettext/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/gettext/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/gettext/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/gettext/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/gettext/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -466,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58579,17 +56446,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -740,6 +755,8 @@
- 	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
- 	uninstall-serviceDATA
+@@ -790,9 +799,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/gettext/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/gettext/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/gettext/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/gettext/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/gettext/Makefile.in
  
-+
-+gettextexport.lo: ../../common/kbprojectsettings.h
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- kbabel/filters/linguist/Makefile.in
-+++ kbabel/filters/linguist/Makefile.in
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/filters/linguist/Makefile.in kdesdk-3.5.5/kbabel/filters/linguist/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/filters/linguist/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/filters/linguist/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -149,6 +149,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58598,20 +56469,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -197,6 +198,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -228,6 +235,9 @@
+@@ -234,6 +235,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58621,7 +56479,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -268,18 +278,16 @@
+@@ -274,18 +278,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58641,7 +56499,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,14 +308,18 @@
+@@ -306,14 +308,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58660,7 +56518,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -374,14 +386,17 @@
+@@ -380,14 +386,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58678,7 +56536,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -422,7 +437,7 @@
+@@ -428,7 +437,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -58687,7 +56545,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +475,9 @@
+@@ -437,9 +446,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/linguist/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/linguist/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/filters/linguist/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/filters/linguist/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -449,9 +458,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/linguist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/linguist/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/linguist/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/linguist/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/linguist/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -466,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58699,8 +56581,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/filters/Makefile.in
-+++ kbabel/filters/Makefile.in
+@@ -788,9 +797,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/linguist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/linguist/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/linguist/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/linguist/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/linguist/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/filters/Makefile.in kdesdk-3.5.5/kbabel/filters/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/filters/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/filters/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58709,20 +56604,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58732,7 +56614,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58752,7 +56634,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58771,7 +56653,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58789,7 +56671,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -372,7 +387,7 @@
+@@ -378,7 +387,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -58798,7 +56680,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -410,9 +425,9 @@
+@@ -387,9 +396,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/filters/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/filters/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -399,9 +408,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -416,9 +425,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58810,8 +56716,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kbabel/filters/xliff/Makefile.in
-+++ kbabel/filters/xliff/Makefile.in
+@@ -720,9 +729,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/filters/xliff/Makefile.in kdesdk-3.5.5/kbabel/filters/xliff/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/filters/xliff/Makefile.in	2006-10-02 20:29:24.000000000 +0200
++++ kdesdk-3.5.5/kbabel/filters/xliff/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -145,6 +145,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58820,20 +56739,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -193,6 +194,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -224,6 +231,9 @@
+@@ -230,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58843,7 +56749,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -264,18 +274,16 @@
+@@ -270,18 +274,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58863,7 +56769,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -296,14 +304,18 @@
+@@ -302,14 +304,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58882,7 +56788,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -370,14 +382,17 @@
+@@ -376,14 +382,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -58900,7 +56806,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -418,7 +433,7 @@
+@@ -424,7 +433,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -58909,7 +56815,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -456,9 +471,9 @@
+@@ -433,9 +442,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/xliff/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/xliff/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/filters/xliff/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/filters/xliff/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -445,9 +454,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/xliff/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/xliff/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/xliff/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/xliff/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/xliff/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -462,9 +471,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58921,8 +56851,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/kbabel/icons/Makefile.in
-+++ kbabel/kbabel/icons/Makefile.in
+@@ -784,9 +793,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/filters/xliff/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/filters/xliff/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/filters/xliff/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/filters/xliff/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/filters/xliff/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/kbabel/icons/Makefile.in kdesdk-3.5.5/kbabel/kbabel/icons/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabel/icons/Makefile.in	2006-10-02 20:29:25.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabel/icons/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -58931,20 +56874,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58954,7 +56884,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58974,7 +56904,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -58993,7 +56923,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -59011,7 +56941,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -361,7 +376,7 @@
+@@ -367,7 +376,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -59020,7 +56950,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -399,9 +414,9 @@
+@@ -376,9 +385,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/icons/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/icons/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabel/icons/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabel/icons/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -388,9 +397,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/icons/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/icons/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabel/icons/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabel/icons/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/icons/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -405,9 +414,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59032,374 +56986,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -544,7 +559,7 @@
- .NOEXPORT:
+@@ -761,9 +770,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/icons/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/icons/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabel/icons/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabel/icons/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/icons/Makefile.in
  
- #>+ 2
--KDE_DIST=hi16-action-catalogmanager.png hi22-action-msgid2msgstr.png hi16-action-spellcheck_from_cursor.png hi22-action-insert_tag.png hi16-action-prevfuzzy.png lo16-action-search2msgstr.png lo32-action-prevuntranslated.png hi16-action-spellcheck_actual.png hi16-action-prevfuzzyuntrans.png hi16-action-nexterror.png hi32-action-insert_tag.png hi16-action-nextfuzzy.png lo16-action-nextuntranslated.png lo16-action-spellcheck_selected.png lo32-action-transsearch.png lo16-action-insert_tag.png lo16-action-nextfuzzy.png lo32-action-nextfuzzyuntrans.png hi16-action-search2msgstr.png lo32-action-togglefuzzy.png hi16-action-transsearch.png hi16-action-togglefuzzy.png lo32-action-catalogmanager.png hi22-action-catalogmanager.png hi32-action-msgid2msgstr.png hi22-action-diff.png hi22-action-nexterror.png lo16-action-autodiff.png hi32-action-prevfuzzyuntrans.png hi32-action-diff.png hi16-action-nextfuzzyuntrans.png hi32-action-preverror.png hi32-action-nexterror.png lo16-action-preverror.png hi32-action-autodiff.png hi16-action-autodiff.png hi32-action-nextuntranslated.png hi16-action-preverror.png lo32-action-preverror.png lo16-action-spellcheck_all.png hi22-action-prevfuzzyuntrans.png hi32-action-search2msgstr.png hi32-action-nextfuzzyuntrans.png hi22-action-togglefuzzy.png lo16-action-spellcheck_actual.png lo16-action-prevfuzzyuntrans.png lo16-action-catalogmanager.png hi16-action-nextuntranslated.png lo16-action-prevuntranslated.png hi32-action-catalogmanager.png lo32-action-prevfuzzyuntrans.png hi16-action-prevuntranslated.png hi32-action-nextfuzzy.png lo32-action-diff.png lo16-action-prevfuzzy.png hi22-action-nextfuzzyuntrans.png hi16-action-spellcheck_selected.png hi16-action-diff.png lo32-action-nextuntranslated.png lo32-action-search2msgstr.png hi16-action-msgid2msgstr.png hi16-action-insert_tag.png lo32-action-insert_tag.png hi22-action-transsearch.png hi22-action-search2msgstr.png hi22-action-prevuntranslated.png hi22-action-prevfuzzy.png lo16-action-togglefuzzy.png Makefile.in lo32-action-msgid2msgstr.png lo32-action-autodiff.png lo16-action-transsearch.png lo16-action-msgid2msgstr.png hi22-action-preverror.png hi32-action-prevuntranslated.png hi32-action-prevfuzzy.png hi22-action-insert_arg.png lo16-action-spellcheck_from_cursor.png lo32-action-nexterror.png hi22-action-nextfuzzy.png lo16-action-insert_arg.png lo16-action-nexterror.png hi22-action-nextuntranslated.png hi32-action-insert_arg.png lo32-action-prevfuzzy.png lo16-action-diff.png lo16-action-nextfuzzyuntrans.png hi16-action-spellcheck_all.png hi22-action-autodiff.png hi16-action-insert_arg.png Makefile.am lo32-action-nextfuzzy.png hi32-action-togglefuzzy.png hi32-action-transsearch.png lo32-action-insert_arg.png 
-+KDE_DIST=hi16-action-catalogmanager.png hi16-action-spellcheck_from_cursor.png hi22-action-msgid2msgstr.png hi16-action-prevfuzzy.png hi22-action-insert_tag.png hi16-action-spellcheck_actual.png lo32-action-prevuntranslated.png lo16-action-search2msgstr.png hi16-action-prevfuzzyuntrans.png hi16-action-nexterror.png hi32-action-insert_tag.png hi16-action-nextfuzzy.png lo16-action-nextuntranslated.png lo16-action-spellcheck_selected.png lo32-action-transsearch.png lo16-action-insert_tag.png lo16-action-nextfuzzy.png hi16-action-search2msgstr.png lo32-action-nextfuzzyuntrans.png lo32-action-togglefuzzy.png hi16-action-transsearch.png lo32-action-catalogmanager.png hi16-action-togglefuzzy.png hi22-action-catalogmanager.png hi32-action-msgid2msgstr.png hi22-action-diff.png hi22-action-nexterror.png lo16-action-autodiff.png hi32-action-prevfuzzyuntrans.png hi32-action-diff.png hi16-action-nextfuzzyuntrans.png hi32-action-preverror.png hi32-action-nexterror.png lo16-action-preverror.png hi32-action-autodiff.png hi16-action-autodiff.png hi32-action-nextuntranslated.png hi16-action-preverror.png lo32-action-preverror.png lo16-action-spellcheck_all.png hi22-action-prevfuzzyuntrans.png hi32-action-search2msgstr.png hi32-action-nextfuzzyuntrans.png hi22-action-togglefuzzy.png lo16-action-spellcheck_actual.png lo16-action-prevfuzzyuntrans.png hi16-action-nextuntranslated.png lo16-action-catalogmanager.png hi32-action-catalogmanager.png lo16-action-prevuntranslated.png lo32-action-prevfuzzyuntrans.png hi16-action-prevuntranslated.png hi32-action-nextfuzzy.png lo32-action-diff.png lo16-action-prevfuzzy.png hi22-action-nextfuzzyuntrans.png hi16-action-spellcheck_selected.png hi16-action-diff.png lo32-action-nextuntranslated.png hi16-action-msgid2msgstr.png lo32-action-search2msgstr.png lo32-action-insert_tag.png hi16-action-insert_tag.png hi22-action-transsearch.png hi22-action-search2msgstr.png hi22-action-prevuntranslated.png hi22-action-prevfuzzy.png lo16-action-togglefuzzy.png Makefile.in lo32-action-msgid2msgstr.png lo32-action-autodiff.png lo16-action-transsearch.png lo16-action-msgid2msgstr.png hi22-action-preverror.png hi32-action-prevuntranslated.png hi32-action-prevfuzzy.png lo16-action-spellcheck_from_cursor.png hi22-action-insert_arg.png lo32-action-nexterror.png hi22-action-nextfuzzy.png lo16-action-insert_arg.png hi22-action-nextuntranslated.png lo16-action-nexterror.png hi32-action-insert_arg.png lo32-action-prevfuzzy.png lo16-action-diff.png lo16-action-nextfuzzyuntrans.png hi16-action-spellcheck_all.png hi22-action-autodiff.png hi16-action-insert_arg.png Makefile.am lo32-action-nextfuzzy.png hi32-action-transsearch.png lo32-action-insert_arg.png hi32-action-togglefuzzy.png 
  
- #>+ 2
- docs-am:
-@@ -552,198 +567,198 @@
- #>+ 195
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/hi32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_arg.png
- 	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png
--	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/lo32-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png
-+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-diff.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png
- 	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/hicolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png
-+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/search2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/search2msgstr.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/preverror.png
--	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/locolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/lo16-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_arg.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/catalogmanager.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-diff.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexterror.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_arg.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_tag.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_tag.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/msgid2msgstr.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/search2msgstr.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/autodiff.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/search2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/catalogmanager.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_all.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_all.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_tag.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-autodiff.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/autodiff.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzy.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/transsearch.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_all.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_all.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/msgid2msgstr.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_from_cursor.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png
- 	$(INSTALL_DATA) $(srcdir)/hi32-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-autodiff.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/autodiff.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-transsearch.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/autodiff.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_tag.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/togglefuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-diff.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_tag.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-insert_arg.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-insert_arg.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/diff.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-diff.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-togglefuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-autodiff.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/autodiff.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_all.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_all.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexterror.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-search2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png
--	$(INSTALL_DATA) $(srcdir)/hi22-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-preverror.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_all.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_all.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevuntranslated.png
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-prevfuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzy.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-insert_tag.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextuntranslated.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-preverror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-nexterror.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexterror.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-msgid2msgstr.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-catalogmanager.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-diff.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/diff.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-nextfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-insert_tag.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-autodiff.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/autodiff.png
--	$(INSTALL_DATA) $(srcdir)/lo32-action-nextuntranslated.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-prevfuzzyuntrans.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-nextfuzzy.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png
-+	$(INSTALL_DATA) $(srcdir)/lo32-action-nexterror.png $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-catalogmanager.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/catalogmanager.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-prevuntranslated.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-transsearch.png $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-action-autodiff.png $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-spellcheck_selected.png $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-spellcheck_actual.png $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/preverror.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_arg.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/catalogmanager.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexterror.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_arg.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_tag.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/msgid2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/search2msgstr.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/autodiff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/search2msgstr.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/catalogmanager.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_all.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/preverror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_arg.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/transsearch.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_tag.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/autodiff.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nexterror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/msgid2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/diff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/catalogmanager.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/togglefuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_from_cursor.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzy.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/transsearch.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_all.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/msgid2msgstr.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_from_cursor.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevfuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/msgid2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/prevuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/togglefuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/togglefuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/autodiff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/transsearch.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/autodiff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/insert_tag.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_selected.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/togglefuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/insert_arg.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/diff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/insert_tag.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_arg.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/preverror.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/catalogmanager.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_arg.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/preverror.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/diff.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/catalogmanager.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/diff.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/search2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/togglefuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/search2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/autodiff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nextuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_all.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/nexterror.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/search2msgstr.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/prevfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/msgid2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevfuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/preverror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_all.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzyuntrans.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/prevuntranslated.png
- 	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzy.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/autodiff.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/insert_tag.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png
--	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nextuntranslated.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nexterror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/preverror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextfuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/transsearch.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/nexterror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/msgid2msgstr.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/catalogmanager.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/nextuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_actual.png
- 	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/diff.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextfuzzyuntrans.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/insert_tag.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/autodiff.png
--	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nextuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/prevfuzzyuntrans.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/nextfuzzy.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/32x32/actions/nexterror.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/catalogmanager.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/prevuntranslated.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/32x32/actions/transsearch.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/22x22/actions/autodiff.png
-+	-rm -f $(DESTDIR)$(iconsdir)/hicolor/16x16/actions/spellcheck_selected.png
-+	-rm -f $(DESTDIR)$(iconsdir)/locolor/16x16/actions/spellcheck_actual.png
- 
- #>+ 15
- force-reedit:
---- kbabel/kbabel/Makefile.in
-+++ kbabel/kbabel/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/kbabel/Makefile.in kdesdk-3.5.5/kbabel/kbabel/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabel/Makefile.in	2006-10-02 20:29:25.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabel/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -183,6 +183,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -59408,20 +57009,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -231,6 +232,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -262,6 +269,9 @@
+@@ -268,6 +269,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59431,7 +57019,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -302,18 +312,16 @@
+@@ -308,18 +312,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59451,7 +57039,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,14 +342,18 @@
+@@ -340,14 +342,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -59470,7 +57058,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -408,14 +420,17 @@
+@@ -414,14 +420,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -59488,7 +57076,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -540,7 +555,7 @@
+@@ -546,7 +555,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -59497,7 +57085,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +593,9 @@
+@@ -555,9 +564,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabel/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabel/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -567,9 +576,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabel/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabel/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -584,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59509,159 +57121,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -1054,6 +1069,15 @@
- 	rm -r -f API
+@@ -1280,9 +1289,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabel/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabel/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/Makefile.in
  
-  # this is where the kdelnk file will go
-+
-+#>- kbabel.lo: ../common/kbprojectsettings.h ../common/version.h
-+#>+ 1
-+kbabel.lo: kbabel.moc  ../common/kbprojectsettings.h ../common/version.h
-+#>- kbabelview.lo: ../common/kbprojectsettings.h ../common/version.h
-+#>+ 1
-+kbabelview.lo: kbabelview.moc  ../common/kbprojectsettings.h ../common/version.h
-+kbabelview2.lo: ../common/kbprojectsettings.h
-+main.o: ../common/version.h
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-@@ -1170,32 +1194,32 @@
- mocs: kbcataloglistview.moc
  
- #>+ 3
--taglistview.moc: $(srcdir)/taglistview.h
--	$(MOC) $(srcdir)/taglistview.h -o taglistview.moc
-+kbabelpref.moc: $(srcdir)/kbabelpref.h
-+	$(MOC) $(srcdir)/kbabelpref.h -o kbabelpref.moc
- 
- #>+ 2
--mocs: taglistview.moc
-+mocs: kbabelpref.moc
- 
- #>+ 3
--kbcatalog.moc: $(srcdir)/kbcatalog.h
--	$(MOC) $(srcdir)/kbcatalog.h -o kbcatalog.moc
-+kbabelview.moc: $(srcdir)/kbabelview.h
-+	$(MOC) $(srcdir)/kbabelview.h -o kbabelview.moc
- 
- #>+ 2
--mocs: kbcatalog.moc
-+mocs: kbabelview.moc
- 
- #>+ 3
--kbabelpref.moc: $(srcdir)/kbabelpref.h
--	$(MOC) $(srcdir)/kbabelpref.h -o kbabelpref.moc
-+taglistview.moc: $(srcdir)/taglistview.h
-+	$(MOC) $(srcdir)/taglistview.h -o taglistview.moc
- 
- #>+ 2
--mocs: kbabelpref.moc
-+mocs: taglistview.moc
- 
- #>+ 3
--kbabelview.moc: $(srcdir)/kbabelview.h
--	$(MOC) $(srcdir)/kbabelview.h -o kbabelview.moc
-+kbcatalog.moc: $(srcdir)/kbcatalog.h
-+	$(MOC) $(srcdir)/kbcatalog.h -o kbcatalog.moc
- 
- #>+ 2
--mocs: kbabelview.moc
-+mocs: kbcatalog.moc
- 
- #>+ 3
- kbabelsplash.moc: $(srcdir)/kbabelsplash.h
-@@ -1206,10 +1230,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headereditor.moc charselectview.moc kbcharselect.moc hidingmsgedit.moc kbcataloglistview.moc taglistview.moc kbcatalog.moc kbabelpref.moc kbabelview.moc kbabelsplash.moc
-+	-rm -f  kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headereditor.moc charselectview.moc kbcharselect.moc hidingmsgedit.moc kbcataloglistview.moc kbabelpref.moc kbabelview.moc taglistview.moc kbcatalog.moc kbabelsplash.moc
- 
- #>+ 2
--KDE_DIST=lo16-app-kbabel.png kbcharselect.h kbabel.desktop kbabel.kcfg editordiffpreferences.ui fontpreferences.ui lo32-app-kbabel.png spelldlgwidget.ui kbcharselect.cpp searchpreferences.ui hi32-app-kbabel.png colorpreferences.ui kbabel-difftoproject.upd fontpreferences.ui.h hi48-app-kbabel.png Makefile.in kbabel-project.upd kbabelui.rc editorpreferences.ui hi16-app-kbabel.png kbabelsettings.kcfgc headerwidget.ui Makefile.am editorpreferences.ui.h 
-+KDE_DIST=lo16-app-kbabel.png kbcharselect.h kbabel.desktop kbabel.kcfg editordiffpreferences.ui lo32-app-kbabel.png fontpreferences.ui spelldlgwidget.ui kbcharselect.cpp hi32-app-kbabel.png searchpreferences.ui colorpreferences.ui kbabel-difftoproject.upd fontpreferences.ui.h hi48-app-kbabel.png kbabel-project.upd Makefile.in kbabelui.rc hi16-app-kbabel.png editorpreferences.ui kbabelsettings.kcfgc headerwidget.ui Makefile.am editorpreferences.ui.h 
- 
- #>+ 4
- clean-idl:
-@@ -1237,23 +1261,23 @@
- 
- #>+ 19
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabel.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/lo16-app-kbabel.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabel.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabel.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabel.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/lo32-app-kbabel.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabel.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/lo16-app-kbabel.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabel.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kbabel.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabel.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabel.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabel.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabel.png
--	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabel.png
- 
- #>+ 15
- force-reedit:
-@@ -1294,7 +1318,7 @@
- 
- 
- #>+ 11
--libkbabel_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbbookmarkhandler.cpp $(srcdir)/kbcatalog.cpp $(srcdir)/headereditor.cpp $(srcdir)/spelldlg.cpp $(srcdir)/gotodialog.cpp $(srcdir)/kbhighlighting.cpp $(srcdir)/mymultilineedit.cpp $(srcdir)/hidingmsgedit.cpp $(srcdir)/kbabelpref.cpp $(srcdir)/kbcatalogview.cpp $(srcdir)/commentview.cpp $(srcdir)/contextview.cpp $(srcdir)/charselectview.cpp $(srcdir)/taglistview.cpp $(srcdir)/sourceview.cpp $(srcdir)/kbabelview.cpp $(srcdir)/kbabelview2.cpp $(srcdir)/kbabel.cpp $(srcdir)/kbabelsplash.cpp $(srcdir)/kbcataloglistview.cpp $(srcdir)/kbcataloglistviewitem.cpp $(srcdir)/errorlistview.cpp kbabeliface_skel.cpp headerwidget.cpp spelldlgwidget.cpp fontpreferences.cpp editordiffpreferences.cpp editorpreferences.cpp searchpreferences.cpp colorpreferences.cpp kbabelsettings.cpp  searchpreferences.moc kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc editorpreferences.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headerwidget.moc headereditor.moc editordiffpreferences.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc fontpreferences.moc spelldlgwidget.moc kbabelview.moc kbabelpref.moc kbcatalog.moc taglistview.moc kbabelsplash.moc colorpreferences.moc
-+libkbabel_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbbookmarkhandler.cpp $(srcdir)/kbcatalog.cpp $(srcdir)/headereditor.cpp $(srcdir)/spelldlg.cpp $(srcdir)/gotodialog.cpp $(srcdir)/kbhighlighting.cpp $(srcdir)/mymultilineedit.cpp $(srcdir)/hidingmsgedit.cpp $(srcdir)/kbabelpref.cpp $(srcdir)/kbcatalogview.cpp $(srcdir)/commentview.cpp $(srcdir)/contextview.cpp $(srcdir)/charselectview.cpp $(srcdir)/taglistview.cpp $(srcdir)/sourceview.cpp $(srcdir)/kbabelview.cpp  ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelview2.cpp  ../common/kbprojectsettings.h $(srcdir)/kbabel.cpp  ../common/kbprojectsettings.h ../common/version.h $(srcdir)/kbabelsplash.cpp $(srcdir)/kbcataloglistview.cpp $(srcdir)/kbcataloglistviewitem.cpp $(srcdir)/errorlistview.cpp kbabeliface_skel.cpp headerwidget.cpp spelldlgwidget.cpp fontpreferences.cpp editordiffpreferences.cpp editorpreferences.cpp searchpreferences.cpp colorpreferences.cpp kbabelsettings.cpp  searchpreferences.moc kbbookmarkhandler.moc kbhighlighting.moc sourceview.moc kbabel.moc mymultilineedit.moc editorpreferences.moc kbcatalogview.moc errorlistview.moc spelldlg.moc commentview.moc contextview.moc headerwidget.moc headereditor.moc editordiffpreferences.moc charselectview.moc hidingmsgedit.moc kbcataloglistview.moc fontpreferences.moc spelldlgwidget.moc kbcatalog.moc taglistview.moc kbabelview.moc kbabelpref.moc kbabelsplash.moc colorpreferences.moc
- 	@echo 'creating libkbabel_la.all_cpp.cpp ...'; \
- 	rm -f libkbabel_la.all_cpp.files libkbabel_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkbabel_la.all_cpp.final; \
-@@ -1329,7 +1353,7 @@
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 65
-+#>+ 63
- errorlistview.lo: errorlistview.moc 
- kbcatalogview.o: kbcatalogview.moc 
- kbcataloglistview.o: kbcataloglistview.moc 
-@@ -1347,7 +1371,6 @@
- charselectview.lo: charselectview.moc 
- $(srcdir)/charselectview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
- $(srcdir)/gotodialog.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
--kbabel.lo: kbabel.moc 
- spelldlg.o: spelldlg.moc 
- $(srcdir)/spelldlg.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
- $(srcdir)/kbabelpref.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
-@@ -1363,7 +1386,6 @@
- contextview.lo: contextview.moc 
- contextview.o: contextview.moc 
- kbhighlighting.o: kbhighlighting.moc 
--kbabelview.lo: kbabelview.moc 
- $(srcdir)/contextview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
- $(srcdir)/kbabelview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
- kbcatalog.o: kbcatalog.moc 
-@@ -1376,8 +1398,8 @@
- kbabel.o: kbabel.moc 
- headereditor.lo: headereditor.moc 
- $(srcdir)/sourceview.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
--taglistview.o: taglistview.moc 
- mymultilineedit.lo: mymultilineedit.moc 
-+taglistview.o: taglistview.moc 
- $(srcdir)/kbcatalog.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
- kbabelsplash.o: kbabelsplash.moc 
- $(srcdir)/kbabelsplash.cpp: headerwidget.h spelldlgwidget.h fontpreferences.h editordiffpreferences.h editorpreferences.h searchpreferences.h colorpreferences.h kbabelsettings.h 
---- kbabel/kbabel/pics/Makefile.in
-+++ kbabel/kbabel/pics/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/kbabel/pics/Makefile.in kdesdk-3.5.5/kbabel/kbabel/pics/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabel/pics/Makefile.in	2006-10-02 20:29:25.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabel/pics/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -59670,20 +57144,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59693,7 +57154,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59713,7 +57174,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -59732,7 +57193,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -59750,7 +57211,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -373,7 +388,7 @@
+@@ -379,7 +388,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -59759,7 +57220,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -411,9 +426,9 @@
+@@ -388,9 +397,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/pics/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/pics/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabel/pics/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabel/pics/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -400,9 +409,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabel/pics/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabel/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -417,9 +426,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59771,8 +57256,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kbabel/kbabeldict/Makefile.in
-+++ kbabel/kbabeldict/Makefile.in
+@@ -593,9 +602,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabel/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabel/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabel/pics/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabel/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabel/pics/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/kbabeldict/Makefile.in kdesdk-3.5.5/kbabel/kbabeldict/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabeldict/Makefile.in	2006-10-02 20:29:25.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabeldict/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -178,6 +178,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -59781,20 +57279,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -226,6 +227,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -257,6 +264,9 @@
+@@ -263,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59804,7 +57289,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -297,18 +307,16 @@
+@@ -303,18 +307,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59824,7 +57309,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -329,14 +337,18 @@
+@@ -335,14 +337,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -59843,7 +57328,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -403,14 +415,17 @@
+@@ -409,14 +415,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -59861,7 +57346,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -488,7 +503,7 @@
+@@ -494,7 +503,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -59870,7 +57355,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -526,9 +541,9 @@
+@@ -503,9 +512,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -515,9 +524,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -532,9 +541,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59882,124 +57391,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1009,6 +1024,11 @@
- 	rm -r -f API
+@@ -1144,9 +1153,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/Makefile.in
  
-  # this is where the kdelnk file will go
-+
-+#>- kbabeldictbox.lo: ../common/version.h
-+#>+ 1
-+kbabeldictbox.lo: kbabeldictbox.moc  ../common/version.h
-+main.o: ../common/version.h
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-@@ -1029,6 +1049,13 @@
  
- 
- #>+ 3
-+kbabeldictview.moc: $(srcdir)/kbabeldictview.h
-+	$(MOC) $(srcdir)/kbabeldictview.h -o kbabeldictview.moc
-+
-+#>+ 2
-+mocs: kbabeldictview.moc
-+
-+#>+ 3
- aboutmoduledlg.moc: $(srcdir)/aboutmoduledlg.h
- 	$(MOC) $(srcdir)/aboutmoduledlg.h -o aboutmoduledlg.moc
- 
-@@ -1050,13 +1077,6 @@
- mocs: kbabeldict.moc
- 
- #>+ 3
--kbabeldictview.moc: $(srcdir)/kbabeldictview.h
--	$(MOC) $(srcdir)/kbabeldictview.h -o kbabeldictview.moc
--
--#>+ 2
--mocs: kbabeldictview.moc
--
--#>+ 3
- kbabeldictbox.moc: $(srcdir)/kbabeldictbox.h
- 	$(MOC) $(srcdir)/kbabeldictbox.h -o kbabeldictbox.moc
- 
-@@ -1064,18 +1084,18 @@
- mocs: kbabeldictbox.moc
- 
- #>+ 3
--dictchooser.moc: $(srcdir)/dictchooser.h
--	$(MOC) $(srcdir)/dictchooser.h -o dictchooser.moc
-+searchengine.moc: $(srcdir)/searchengine.h
-+	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
- 
- #>+ 2
--mocs: dictchooser.moc
-+mocs: searchengine.moc
- 
- #>+ 3
--searchengine.moc: $(srcdir)/searchengine.h
--	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
-+dictchooser.moc: $(srcdir)/dictchooser.h
-+	$(MOC) $(srcdir)/dictchooser.h -o dictchooser.moc
- 
- #>+ 2
--mocs: searchengine.moc
-+mocs: dictchooser.moc
- 
- #>+ 3
- kbabelsplash.moc: $(srcdir)/kbabelsplash.h
-@@ -1086,7 +1106,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  aboutmoduledlg.moc dictionarymenu.moc kbabeldict.moc kbabeldictview.moc kbabeldictbox.moc dictchooser.moc searchengine.moc kbabelsplash.moc
-+	-rm -f  kbabeldictview.moc aboutmoduledlg.moc dictionarymenu.moc kbabeldict.moc kbabeldictbox.moc searchengine.moc dictchooser.moc kbabelsplash.moc
- 
- #>+ 2
- KDE_DIST=hi16-app-kbabeldict.png kbabeldict.desktop kbabeldict_module.desktop hi48-app-kbabeldict.png lo16-app-kbabeldict.png README.modules Makefile.in lo32-app-kbabeldict.png hi32-app-kbabeldict.png Makefile.am 
-@@ -1107,21 +1127,21 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabeldict.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabeldict.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/lo16-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabeldict.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/lo32-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabeldict.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/lo16-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kbabeldict.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabeldict.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbabeldict.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabeldict.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbabeldict.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbabeldict.png
--	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbabeldict.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbabeldict.png
- 
- #>+ 15
- force-reedit:
-@@ -1181,7 +1201,7 @@
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 19
-+#>+ 18
- dictionarymenu.lo: dictionarymenu.moc 
- dictionarymenu.o: dictionarymenu.moc 
- kbabeldict.o: kbabeldict.moc 
-@@ -1199,4 +1219,3 @@
- aboutmoduledlg.o: aboutmoduledlg.moc 
- dictchooser.lo: dictchooser.moc 
- kbabeldictview.lo: kbabeldictview.moc 
--kbabeldictbox.lo: kbabeldictbox.moc 
---- kbabel/kbabeldict/modules/dbsearchengine/Makefile.in
-+++ kbabel/kbabeldict/modules/dbsearchengine/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/kbabeldict/modules/dbsearchengine/Makefile.in kdesdk-3.5.5/kbabel/kbabeldict/modules/dbsearchengine/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabeldict/modules/dbsearchengine/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabeldict/modules/dbsearchengine/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -153,6 +153,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60008,20 +57414,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -201,6 +202,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -232,6 +239,9 @@
+@@ -238,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60031,7 +57424,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -272,18 +282,16 @@
+@@ -278,18 +282,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60051,7 +57444,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,14 +312,18 @@
+@@ -310,14 +312,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60070,7 +57463,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -378,14 +390,17 @@
+@@ -384,14 +390,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60088,7 +57481,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -448,7 +463,7 @@
+@@ -454,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60097,7 +57490,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +501,9 @@
+@@ -463,9 +472,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -475,9 +484,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -492,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60109,17 +57526,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -819,7 +834,7 @@
- 	-rm -f  database.moc dbse_factory.moc dbscan.moc KDBSearchEngine.moc preferenceswidget.moc
+@@ -849,9 +858,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine/Makefile.in
  
- #>+ 2
--KDE_DIST=configure.in.bot STRUCTURE dbsearchengine.desktop AUTHOR configure.in.in Makefile.in dbseprefwidget.ui makemsgdb.C Makefile.am 
-+KDE_DIST=configure.in.bot STRUCTURE dbsearchengine.desktop AUTHOR configure.in.in dbseprefwidget.ui Makefile.in makemsgdb.C Makefile.am 
  
- #>+ 4
- clean-ui:
---- kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in
-+++ kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in kdesdk-3.5.5/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -156,6 +156,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60128,20 +57549,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -204,6 +205,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -235,6 +242,9 @@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60151,7 +57559,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -275,18 +285,16 @@
+@@ -281,18 +285,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60171,7 +57579,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -307,14 +315,18 @@
+@@ -313,14 +315,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60190,7 +57598,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -381,14 +393,17 @@
+@@ -387,14 +393,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60208,7 +57616,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -445,7 +460,7 @@
+@@ -451,7 +460,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60217,7 +57625,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +498,9 @@
+@@ -460,9 +469,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine2/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine2/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -472,9 +481,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine2/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine2/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -489,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60229,76 +57661,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -780,18 +795,18 @@
+@@ -850,9 +859,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine2/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/dbsearchengine2/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/dbsearchengine2/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/dbsearchengine2/Makefile.in
  
  
- #>+ 3
--dbse2_factory.moc: $(srcdir)/dbse2_factory.h
--	$(MOC) $(srcdir)/dbse2_factory.h -o dbse2_factory.moc
-+algorithms.moc.cpp: $(srcdir)/algorithms.h
-+	$(MOC) $(srcdir)/algorithms.h -o algorithms.moc.cpp
- 
- #>+ 2
--mocs: dbse2_factory.moc
-+mocs: algorithms.moc.cpp
- 
- #>+ 3
--algorithms.moc.cpp: $(srcdir)/algorithms.h
--	$(MOC) $(srcdir)/algorithms.h -o algorithms.moc.cpp
-+dbse2_factory.moc: $(srcdir)/dbse2_factory.h
-+	$(MOC) $(srcdir)/dbse2_factory.h -o dbse2_factory.moc
- 
- #>+ 2
--mocs: algorithms.moc.cpp
-+mocs: dbse2_factory.moc
- 
- #>+ 3
- dbscan.moc: $(srcdir)/dbscan.h
-@@ -801,25 +816,25 @@
- mocs: dbscan.moc
- 
- #>+ 3
--preferenceswidget.moc: $(srcdir)/preferenceswidget.h
--	$(MOC) $(srcdir)/preferenceswidget.h -o preferenceswidget.moc
-+KDBSearchEngine2.moc: $(srcdir)/KDBSearchEngine2.h
-+	$(MOC) $(srcdir)/KDBSearchEngine2.h -o KDBSearchEngine2.moc
- 
- #>+ 2
--mocs: preferenceswidget.moc
-+mocs: KDBSearchEngine2.moc
- 
- #>+ 3
--KDBSearchEngine2.moc: $(srcdir)/KDBSearchEngine2.h
--	$(MOC) $(srcdir)/KDBSearchEngine2.h -o KDBSearchEngine2.moc
-+preferenceswidget.moc: $(srcdir)/preferenceswidget.h
-+	$(MOC) $(srcdir)/preferenceswidget.h -o preferenceswidget.moc
- 
- #>+ 2
--mocs: KDBSearchEngine2.moc
-+mocs: preferenceswidget.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  dbse2_factory.moc algorithms.moc.cpp dbscan.moc preferenceswidget.moc KDBSearchEngine2.moc
-+	-rm -f  algorithms.moc.cpp dbse2_factory.moc dbscan.moc KDBSearchEngine2.moc preferenceswidget.moc
- 
- #>+ 2
--KDE_DIST=chunk.h sourcedialog.ui algorithms.h dbscan.h dbsearchengine2.desktop preferenceswidget.h AUTHOR Makefile.in dbseprefwidget.ui Makefile.am dbse2.ui 
-+KDE_DIST=chunk.h sourcedialog.ui algorithms.h dbscan.h dbsearchengine2.desktop preferenceswidget.h AUTHOR dbseprefwidget.ui Makefile.in Makefile.am dbse2.ui 
- 
- #>+ 5
- clean-ui:
-@@ -873,7 +888,7 @@
- 
- 
- #>+ 11
--kbabeldict_dbsearchengine2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dbscan.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/KDBSearchEngine2.cpp $(srcdir)/database.cpp $(srcdir)/dbentries.cpp $(srcdir)/dbse2_factory.cpp $(srcdir)/algorithms.cpp $(srcdir)/chunk.cpp dbse2.cpp sourcedialog.cpp algorithms.moc.cpp  dbse2.moc dbse2_factory.moc dbscan.moc sourcedialog.moc KDBSearchEngine2.moc preferenceswidget.moc
-+kbabeldict_dbsearchengine2_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dbscan.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/KDBSearchEngine2.cpp $(srcdir)/database.cpp $(srcdir)/dbentries.cpp $(srcdir)/dbse2_factory.cpp $(srcdir)/algorithms.cpp $(srcdir)/chunk.cpp dbse2.cpp sourcedialog.cpp algorithms.moc.cpp  dbse2.moc dbse2_factory.moc dbscan.moc sourcedialog.moc preferenceswidget.moc KDBSearchEngine2.moc
- 	@echo 'creating kbabeldict_dbsearchengine2_la.all_cpp.cpp ...'; \
- 	rm -f kbabeldict_dbsearchengine2_la.all_cpp.files kbabeldict_dbsearchengine2_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kbabeldict_dbsearchengine2_la.all_cpp.final; \
---- kbabel/kbabeldict/modules/Makefile.in
-+++ kbabel/kbabeldict/modules/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/kbabeldict/modules/Makefile.in kdesdk-3.5.5/kbabel/kbabeldict/modules/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabeldict/modules/Makefile.in	2006-10-02 20:29:25.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabeldict/modules/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60307,20 +57684,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60330,7 +57694,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60350,7 +57714,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60369,7 +57733,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60387,7 +57751,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -373,7 +388,7 @@
+@@ -379,7 +388,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -60396,7 +57760,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -411,9 +426,9 @@
+@@ -388,9 +397,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -400,9 +409,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -417,9 +426,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60408,8 +57796,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kbabel/kbabeldict/modules/poauxiliary/Makefile.in
-+++ kbabel/kbabeldict/modules/poauxiliary/Makefile.in
+@@ -721,9 +730,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/kbabeldict/modules/poauxiliary/Makefile.in kdesdk-3.5.5/kbabel/kbabeldict/modules/poauxiliary/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabeldict/modules/poauxiliary/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabeldict/modules/poauxiliary/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -152,6 +152,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60418,20 +57819,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -200,6 +201,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -231,6 +238,9 @@
+@@ -237,6 +238,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60441,7 +57829,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -271,18 +281,16 @@
+@@ -277,18 +281,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60461,7 +57849,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -303,14 +311,18 @@
+@@ -309,14 +311,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60480,7 +57868,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -377,14 +389,17 @@
+@@ -383,14 +389,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60498,7 +57886,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -443,7 +458,7 @@
+@@ -449,7 +458,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60507,7 +57895,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +496,9 @@
+@@ -458,9 +467,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/poauxiliary/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/poauxiliary/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/poauxiliary/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/poauxiliary/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -470,9 +479,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/poauxiliary/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/poauxiliary/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/poauxiliary/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/poauxiliary/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/poauxiliary/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -487,9 +496,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60519,8 +57931,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/kbabeldict/modules/pocompendium/Makefile.in
-+++ kbabel/kbabeldict/modules/pocompendium/Makefile.in
+@@ -828,9 +837,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/poauxiliary/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/poauxiliary/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/poauxiliary/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/poauxiliary/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/poauxiliary/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/kbabeldict/modules/pocompendium/Makefile.in kdesdk-3.5.5/kbabel/kbabeldict/modules/pocompendium/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabeldict/modules/pocompendium/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabeldict/modules/pocompendium/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -153,6 +153,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60529,20 +57954,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -201,6 +202,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -232,6 +239,9 @@
+@@ -238,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60552,7 +57964,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -272,18 +282,16 @@
+@@ -278,18 +282,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60572,7 +57984,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,14 +312,18 @@
+@@ -310,14 +312,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60591,7 +58003,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -378,14 +390,17 @@
+@@ -384,14 +390,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60609,7 +58021,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -448,7 +463,7 @@
+@@ -454,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60618,7 +58030,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +501,9 @@
+@@ -463,9 +472,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/pocompendium/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/pocompendium/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/pocompendium/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/pocompendium/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -475,9 +484,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/pocompendium/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/pocompendium/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/pocompendium/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/pocompendium/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/pocompendium/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -492,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60630,63 +58066,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -779,13 +794,6 @@
+@@ -841,9 +850,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/pocompendium/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/pocompendium/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/pocompendium/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/pocompendium/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/pocompendium/Makefile.in
  
  
- #>+ 3
--pc_factory.moc: $(srcdir)/pc_factory.h
--	$(MOC) $(srcdir)/pc_factory.h -o pc_factory.moc
--
--#>+ 2
--mocs: pc_factory.moc
--
--#>+ 3
- compendiumdata.moc: $(srcdir)/compendiumdata.h
- 	$(MOC) $(srcdir)/compendiumdata.h -o compendiumdata.moc
- 
-@@ -793,11 +801,11 @@
- mocs: compendiumdata.moc
- 
- #>+ 3
--preferenceswidget.moc: $(srcdir)/preferenceswidget.h
--	$(MOC) $(srcdir)/preferenceswidget.h -o preferenceswidget.moc
-+pc_factory.moc: $(srcdir)/pc_factory.h
-+	$(MOC) $(srcdir)/pc_factory.h -o pc_factory.moc
- 
- #>+ 2
--mocs: preferenceswidget.moc
-+mocs: pc_factory.moc
- 
- #>+ 3
- pocompendium.moc: $(srcdir)/pocompendium.h
-@@ -807,8 +815,15 @@
- mocs: pocompendium.moc
- 
- #>+ 3
-+preferenceswidget.moc: $(srcdir)/preferenceswidget.h
-+	$(MOC) $(srcdir)/preferenceswidget.h -o preferenceswidget.moc
-+
-+#>+ 2
-+mocs: preferenceswidget.moc
-+
-+#>+ 3
- clean-metasources:
--	-rm -f  pc_factory.moc compendiumdata.moc preferenceswidget.moc pocompendium.moc
-+	-rm -f  compendiumdata.moc pc_factory.moc pocompendium.moc preferenceswidget.moc
- 
- #>+ 2
- KDE_DIST=pwidget.ui Makefile.in pocompendium.desktop Makefile.am 
-@@ -864,7 +879,7 @@
- 
- 
- #>+ 11
--kbabeldict_pocompendium_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pocompendium.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/pc_factory.cpp $(srcdir)/compendiumdata.cpp pwidget.cpp  compendiumdata.moc pc_factory.moc pwidget.moc pocompendium.moc preferenceswidget.moc
-+kbabeldict_pocompendium_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pocompendium.cpp $(srcdir)/preferenceswidget.cpp $(srcdir)/pc_factory.cpp $(srcdir)/compendiumdata.cpp pwidget.cpp  pc_factory.moc compendiumdata.moc pwidget.moc preferenceswidget.moc pocompendium.moc
- 	@echo 'creating kbabeldict_pocompendium_la.all_cpp.cpp ...'; \
- 	rm -f kbabeldict_pocompendium_la.all_cpp.files kbabeldict_pocompendium_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kbabeldict_pocompendium_la.all_cpp.final; \
---- kbabel/kbabeldict/modules/tmx/Makefile.in
-+++ kbabel/kbabeldict/modules/tmx/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbabel/kbabeldict/modules/tmx/Makefile.in kdesdk-3.5.5/kbabel/kbabeldict/modules/tmx/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/kbabeldict/modules/tmx/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbabel/kbabeldict/modules/tmx/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -153,6 +153,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60695,20 +58089,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -201,6 +202,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -232,6 +239,9 @@
+@@ -238,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60718,7 +58099,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -272,18 +282,16 @@
+@@ -278,18 +282,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60738,7 +58119,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -304,14 +312,18 @@
+@@ -310,14 +312,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60757,7 +58138,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -378,14 +390,17 @@
+@@ -384,14 +390,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60775,7 +58156,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -444,7 +459,7 @@
+@@ -450,7 +459,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60784,7 +58165,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +497,9 @@
+@@ -459,9 +468,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/tmx/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/tmx/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/tmx/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/tmx/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -471,9 +480,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/tmx/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/tmx/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/tmx/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/tmx/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/tmx/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -488,9 +497,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60796,8 +58201,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbabel/Makefile.in
-+++ kbabel/Makefile.in
+@@ -837,9 +846,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/tmx/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/tmx/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbabel/kbabeldict/modules/tmx/Makefile
++	  $(AUTOMAKE) --gnu  kbabel/kbabeldict/modules/tmx/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbabel/kbabeldict/modules/tmx/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbabel/Makefile.in kdesdk-3.5.5/kbabel/Makefile.in
+--- kdesdk-3.5.5.old/kbabel/Makefile.in	2006-10-02 20:29:21.000000000 +0200
++++ kdesdk-3.5.5/kbabel/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -111,6 +111,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60806,20 +58224,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -159,6 +160,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -190,6 +197,9 @@
+@@ -196,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60829,7 +58234,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -230,18 +240,16 @@
+@@ -236,18 +240,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60849,7 +58254,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -262,14 +270,18 @@
+@@ -268,14 +270,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60868,7 +58273,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -336,14 +348,17 @@
+@@ -342,14 +348,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60886,7 +58291,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -374,7 +389,7 @@
+@@ -380,7 +389,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -60895,7 +58300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -412,9 +427,9 @@
+@@ -418,9 +427,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60907,8 +58312,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kbugbuster/backend/Makefile.in
-+++ kbugbuster/backend/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbugbuster/backend/Makefile.in kdesdk-3.5.5/kbugbuster/backend/Makefile.in
+--- kdesdk-3.5.5.old/kbugbuster/backend/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbugbuster/backend/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -135,6 +135,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -60917,20 +58323,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -214,6 +221,9 @@
+@@ -220,6 +221,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60940,7 +58333,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -254,18 +264,16 @@
+@@ -260,18 +264,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60960,7 +58353,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -286,14 +294,18 @@
+@@ -292,14 +294,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -60979,7 +58372,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -360,14 +372,17 @@
+@@ -366,14 +372,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -60997,7 +58390,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -410,7 +425,7 @@
+@@ -416,7 +425,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61006,7 +58399,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -448,9 +463,9 @@
+@@ -425,9 +434,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/backend/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/backend/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbugbuster/backend/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbugbuster/backend/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -437,9 +446,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/backend/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/backend/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/backend/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/backend/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/backend/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -454,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61018,112 +58435,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -699,13 +714,6 @@
- .NOEXPORT:
+@@ -780,9 +789,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/backend/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/backend/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/backend/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/backend/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/backend/Makefile.in
  
- #>+ 3
--mailsender.moc: $(srcdir)/mailsender.h
--	$(MOC) $(srcdir)/mailsender.h -o mailsender.moc
--
--#>+ 2
--mocs: mailsender.moc
--
--#>+ 3
- packagelistjob.moc: $(srcdir)/packagelistjob.h
- 	$(MOC) $(srcdir)/packagelistjob.h -o packagelistjob.moc
  
-@@ -720,13 +728,6 @@
- mocs: smtp.moc
- 
- #>+ 3
--bugsystem.moc: $(srcdir)/bugsystem.h
--	$(MOC) $(srcdir)/bugsystem.h -o bugsystem.moc
--
--#>+ 2
--mocs: bugsystem.moc
--
--#>+ 3
- bugdetailsjob.moc: $(srcdir)/bugdetailsjob.h
- 	$(MOC) $(srcdir)/bugdetailsjob.h -o bugdetailsjob.moc
- 
-@@ -734,13 +735,6 @@
- mocs: bugdetailsjob.moc
- 
- #>+ 3
--bugjob.moc: $(srcdir)/bugjob.h
--	$(MOC) $(srcdir)/bugjob.h -o bugjob.moc
--
--#>+ 2
--mocs: bugjob.moc
--
--#>+ 3
- bugmybugsjob.moc: $(srcdir)/bugmybugsjob.h
- 	$(MOC) $(srcdir)/bugmybugsjob.h -o bugmybugsjob.moc
- 
-@@ -755,11 +749,32 @@
- mocs: buglistjob.moc
- 
- #>+ 3
-+mailsender.moc: $(srcdir)/mailsender.h
-+	$(MOC) $(srcdir)/mailsender.h -o mailsender.moc
-+
-+#>+ 2
-+mocs: mailsender.moc
-+
-+#>+ 3
-+bugsystem.moc: $(srcdir)/bugsystem.h
-+	$(MOC) $(srcdir)/bugsystem.h -o bugsystem.moc
-+
-+#>+ 2
-+mocs: bugsystem.moc
-+
-+#>+ 3
-+bugjob.moc: $(srcdir)/bugjob.h
-+	$(MOC) $(srcdir)/bugjob.h -o bugjob.moc
-+
-+#>+ 2
-+mocs: bugjob.moc
-+
-+#>+ 3
- clean-metasources:
--	-rm -f  mailsender.moc packagelistjob.moc smtp.moc bugsystem.moc bugdetailsjob.moc bugjob.moc bugmybugsjob.moc buglistjob.moc
-+	-rm -f  packagelistjob.moc smtp.moc bugdetailsjob.moc bugmybugsjob.moc buglistjob.moc mailsender.moc bugsystem.moc bugjob.moc
- 
- #>+ 2
--KDE_DIST=bugdetailspart.h processor.h error.h rdfprocessor.h packageimpl.h smtp.h domprocessor.h bugdetailsimpl.h bugjob.h bugcache.h bugcommand.h buglistjob.h packagelistjob.h bugimpl.h kbbprefs.h htmlparser.h bugdetailsjob.h bugserverconfig.h bugserver.h bugdetails.h Makefile.in bugsystem.h package.h bug.h person.h mailsender.h bugmybugsjob.h Makefile.am 
-+KDE_DIST=bugdetailspart.h processor.h error.h rdfprocessor.h packageimpl.h smtp.h domprocessor.h bugdetailsimpl.h bugcache.h bugjob.h bugcommand.h buglistjob.h packagelistjob.h kbbprefs.h bugimpl.h htmlparser.h bugdetailsjob.h bugserverconfig.h bugserver.h bugdetails.h Makefile.in bugsystem.h package.h person.h bug.h mailsender.h bugmybugsjob.h Makefile.am 
- 
- #>+ 2
- docs-am:
-@@ -803,7 +818,7 @@
- 
- 
- #>+ 11
--libkbbbackend_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelistjob.cpp $(srcdir)/bugjob.cpp $(srcdir)/package.cpp $(srcdir)/bugsystem.cpp $(srcdir)/bug.cpp $(srcdir)/bugdetails.cpp $(srcdir)/bugcommand.cpp $(srcdir)/buglistjob.cpp $(srcdir)/bugmybugsjob.cpp $(srcdir)/mailsender.cpp $(srcdir)/bugcache.cpp $(srcdir)/bugdetailsjob.cpp $(srcdir)/person.cpp $(srcdir)/smtp.cpp $(srcdir)/bugserver.cpp $(srcdir)/bugserverconfig.cpp $(srcdir)/processor.cpp $(srcdir)/domprocessor.cpp $(srcdir)/rdfprocessor.cpp $(srcdir)/htmlparser.cpp $(srcdir)/kbbprefs.cpp  packagelistjob.moc mailsender.moc smtp.moc bugsystem.moc bugdetailsjob.moc bugmybugsjob.moc bugjob.moc buglistjob.moc
-+libkbbbackend_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelistjob.cpp $(srcdir)/bugjob.cpp $(srcdir)/package.cpp $(srcdir)/bugsystem.cpp $(srcdir)/bug.cpp $(srcdir)/bugdetails.cpp $(srcdir)/bugcommand.cpp $(srcdir)/buglistjob.cpp $(srcdir)/bugmybugsjob.cpp $(srcdir)/mailsender.cpp $(srcdir)/bugcache.cpp $(srcdir)/bugdetailsjob.cpp $(srcdir)/person.cpp $(srcdir)/smtp.cpp $(srcdir)/bugserver.cpp $(srcdir)/bugserverconfig.cpp $(srcdir)/processor.cpp $(srcdir)/domprocessor.cpp $(srcdir)/rdfprocessor.cpp $(srcdir)/htmlparser.cpp $(srcdir)/kbbprefs.cpp  packagelistjob.moc smtp.moc bugdetailsjob.moc bugmybugsjob.moc buglistjob.moc mailsender.moc bugsystem.moc bugjob.moc
- 	@echo 'creating libkbbbackend_la.all_cpp.cpp ...'; \
- 	rm -f libkbbbackend_la.all_cpp.files libkbbbackend_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkbbbackend_la.all_cpp.final; \
-@@ -841,8 +856,8 @@
- #>+ 19
- buglistjob.o: buglistjob.moc 
- bugmybugsjob.o: bugmybugsjob.moc 
--mailsender.lo: mailsender.moc 
- bugsystem.lo: bugsystem.moc 
-+mailsender.lo: mailsender.moc 
- bugdetailsjob.lo: bugdetailsjob.moc 
- buglistjob.lo: buglistjob.moc 
- bugdetailsjob.o: bugdetailsjob.moc 
-@@ -854,6 +869,6 @@
- nmcheck-am: nmcheck
- smtp.lo: smtp.moc 
- bugjob.lo: bugjob.moc 
-+bugmybugsjob.lo: bugmybugsjob.moc 
- packagelistjob.o: packagelistjob.moc 
- mailsender.o: mailsender.moc 
--bugmybugsjob.lo: bugmybugsjob.moc 
---- kbugbuster/gui/Makefile.in
-+++ kbugbuster/gui/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbugbuster/gui/Makefile.in kdesdk-3.5.5/kbugbuster/gui/Makefile.in
+--- kdesdk-3.5.5.old/kbugbuster/gui/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbugbuster/gui/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -147,6 +147,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -61132,20 +58458,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -195,6 +196,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -226,6 +233,9 @@
+@@ -232,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61155,7 +58468,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -266,18 +276,16 @@
+@@ -272,18 +276,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61175,7 +58488,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,14 +306,18 @@
+@@ -304,14 +306,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -61194,7 +58507,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -372,14 +384,17 @@
+@@ -378,14 +384,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -61212,7 +58525,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -441,7 +456,7 @@
+@@ -447,7 +456,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61221,7 +58534,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -479,9 +494,9 @@
+@@ -456,9 +465,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/gui/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/gui/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbugbuster/gui/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbugbuster/gui/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -468,9 +477,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/gui/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/gui/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/gui/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/gui/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/gui/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -485,9 +494,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61233,54 +58570,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -801,6 +816,13 @@
- mocs: loadallbugsdlg.moc
+@@ -875,9 +884,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/gui/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/gui/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/gui/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/gui/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/gui/Makefile.in
  
- #>+ 3
-+kbbmainwindow.moc: $(srcdir)/kbbmainwindow.h
-+	$(MOC) $(srcdir)/kbbmainwindow.h -o kbbmainwindow.moc
-+
-+#>+ 2
-+mocs: kbbmainwindow.moc
-+
-+#>+ 3
- preferencesdialog.moc: $(srcdir)/preferencesdialog.h
- 	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
  
-@@ -815,13 +837,6 @@
- mocs: messageeditor.moc
- 
- #>+ 3
--kbbmainwindow.moc: $(srcdir)/kbbmainwindow.h
--	$(MOC) $(srcdir)/kbbmainwindow.h -o kbbmainwindow.moc
--
--#>+ 2
--mocs: kbbmainwindow.moc
--
--#>+ 3
- cwbuglistcontainer.moc: $(srcdir)/cwbuglistcontainer.h
- 	$(MOC) $(srcdir)/cwbuglistcontainer.h -o cwbuglistcontainer.moc
- 
-@@ -844,7 +859,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  packageselectdialog.moc msginputdialog.moc cwbugdetails.moc severityselectdialog.moc serverconfigdialog.moc cwbugdetailscontainer.moc cwloadingwidget.moc loadallbugsdlg.moc preferencesdialog.moc messageeditor.moc kbbmainwindow.moc cwbuglistcontainer.moc cwsearchwidget.moc centralwidget.moc
-+	-rm -f  packageselectdialog.moc msginputdialog.moc cwbugdetails.moc severityselectdialog.moc serverconfigdialog.moc cwbugdetailscontainer.moc cwloadingwidget.moc loadallbugsdlg.moc kbbmainwindow.moc preferencesdialog.moc messageeditor.moc cwbuglistcontainer.moc cwsearchwidget.moc centralwidget.moc
- 
- #>+ 2
- KDE_DIST=packageselectdialog.h preferencesdialog.h messageeditor.h msginputdialog.h cwsearchwidget_base.ui cwsearchwidget.h cwbugdetailscontainer.h buglvi.h severityselectdialog.h serverconfigdialog.h packagelvi.h cwbugdetailscontainer_base.ui kbbmainwindow.h kbbbookmarkmanager.h Makefile.in cwbuglistcontainer.h centralwidget_base.ui cwloadingwidget.h cwbugdetails.h loadallbugsdlg.h centralwidget.h Makefile.am 
-@@ -898,7 +913,7 @@
- 
- 
- #>+ 11
--libkbbmainwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelvi.cpp $(srcdir)/buglvi.cpp $(srcdir)/cwloadingwidget.cpp $(srcdir)/cwsearchwidget.cpp $(srcdir)/cwbugdetailscontainer.cpp $(srcdir)/cwbuglistcontainer.cpp $(srcdir)/cwbugdetails.cpp $(srcdir)/centralwidget.cpp $(srcdir)/kbbmainwindow.cpp $(srcdir)/msginputdialog.cpp $(srcdir)/packageselectdialog.cpp $(srcdir)/messageeditor.cpp $(srcdir)/severityselectdialog.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/loadallbugsdlg.cpp $(srcdir)/serverconfigdialog.cpp cwsearchwidget_base.cpp cwbugdetailscontainer_base.cpp centralwidget_base.cpp  packageselectdialog.moc msginputdialog.moc cwbugdetails.moc serverconfigdialog.moc severityselectdialog.moc cwbugdetailscontainer_base.moc cwloadingwidget.moc cwbugdetailscontainer.moc loadallbugsdlg.moc cwsearchwidget_base.moc kbbmainwindow.moc messageeditor.moc preferencesdialog.moc cwbuglistcontainer.moc centralwidget_base.moc cwsearchwidget.moc centralwidget.moc
-+libkbbmainwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/packagelvi.cpp $(srcdir)/buglvi.cpp $(srcdir)/cwloadingwidget.cpp $(srcdir)/cwsearchwidget.cpp $(srcdir)/cwbugdetailscontainer.cpp $(srcdir)/cwbuglistcontainer.cpp $(srcdir)/cwbugdetails.cpp $(srcdir)/centralwidget.cpp $(srcdir)/kbbmainwindow.cpp $(srcdir)/msginputdialog.cpp $(srcdir)/packageselectdialog.cpp $(srcdir)/messageeditor.cpp $(srcdir)/severityselectdialog.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/loadallbugsdlg.cpp $(srcdir)/serverconfigdialog.cpp cwsearchwidget_base.cpp cwbugdetailscontainer_base.cpp centralwidget_base.cpp  packageselectdialog.moc msginputdialog.moc cwbugdetails.moc serverconfigdialog.moc severityselectdialog.moc cwbugdetailscontainer_base.moc cwloadingwidget.moc cwbugdetailscontainer.moc loadallbugsdlg.moc cwsearchwidget_base.moc messageeditor.moc preferencesdialog.moc kbbmainwindow.moc cwbuglistcontainer.moc centralwidget_base.moc cwsearchwidget.moc centralwidget.moc
- 	@echo 'creating libkbbmainwindow_la.all_cpp.cpp ...'; \
- 	rm -f libkbbmainwindow_la.all_cpp.files libkbbmainwindow_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkbbmainwindow_la.all_cpp.final; \
---- kbugbuster/kresources/Makefile.in
-+++ kbugbuster/kresources/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbugbuster/kresources/Makefile.in kdesdk-3.5.5/kbugbuster/kresources/Makefile.in
+--- kdesdk-3.5.5.old/kbugbuster/kresources/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbugbuster/kresources/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -141,6 +141,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -61289,20 +58593,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -189,6 +190,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -220,6 +227,9 @@
+@@ -226,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61312,7 +58603,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -260,18 +270,16 @@
+@@ -266,18 +270,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61332,7 +58623,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -292,14 +300,18 @@
+@@ -298,14 +300,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -61351,7 +58642,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -366,14 +378,17 @@
+@@ -372,14 +378,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -61369,7 +58660,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -416,7 +431,7 @@
+@@ -422,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61378,7 +58669,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -454,9 +469,9 @@
+@@ -431,9 +440,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/kresources/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/kresources/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbugbuster/kresources/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbugbuster/kresources/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/kresources/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/kresources/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/kresources/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/kresources/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/kresources/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -460,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61390,8 +58705,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kbugbuster/Makefile.in
-+++ kbugbuster/Makefile.in
+@@ -795,9 +804,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/kresources/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/kresources/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/kresources/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/kresources/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/kresources/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kbugbuster/Makefile.in kdesdk-3.5.5/kbugbuster/Makefile.in
+--- kdesdk-3.5.5.old/kbugbuster/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbugbuster/Makefile.in	2006-10-10 00:58:52.000000000 +0200
 @@ -154,6 +154,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -61400,20 +58728,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -202,6 +203,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -233,6 +240,9 @@
+@@ -239,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61423,7 +58738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -273,18 +283,16 @@
+@@ -279,18 +283,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61443,7 +58758,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -305,14 +313,18 @@
+@@ -311,14 +313,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -61462,7 +58777,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -379,14 +391,17 @@
+@@ -385,14 +391,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -61480,7 +58795,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -428,7 +443,7 @@
+@@ -434,7 +443,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61489,7 +58804,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +481,9 @@
+@@ -443,9 +452,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbugbuster/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbugbuster/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -455,9 +464,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -472,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61501,56 +58840,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -852,7 +867,7 @@
- .NOEXPORT:
+@@ -902,9 +911,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/Makefile.in
  
- #>+ 2
--KDE_DIST=hi22-app-kbugbuster.png hi128-app-kbugbuster.png kbugbuster.desktop lo32-app-kbugbuster.png hi48-app-kbugbuster.png hi16-app-kbugbuster.png configure.in.in Makefile.in hi64-app-kbugbuster.png hi32-app-kbugbuster.png Makefile.am lo16-app-kbugbuster.png 
-+KDE_DIST=hi22-app-kbugbuster.png hi128-app-kbugbuster.png kbugbuster.desktop lo32-app-kbugbuster.png hi48-app-kbugbuster.png hi16-app-kbugbuster.png configure.in.in Makefile.in hi32-app-kbugbuster.png hi64-app-kbugbuster.png Makefile.am lo16-app-kbugbuster.png 
  
- #>+ 2
- docs-am:
-@@ -861,29 +876,29 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbugbuster.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/lo32-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbugbuster.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbugbuster.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbugbuster.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbugbuster.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/lo32-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbugbuster.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/lo16-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbugbuster.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbugbuster.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-kbugbuster.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbugbuster.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kbugbuster.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbugbuster.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kbugbuster.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kbugbuster.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbugbuster.png
--	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kbugbuster.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kbugbuster.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kbugbuster.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kbugbuster.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kbugbuster.png
- 
- #>+ 15
---- kbugbuster/pics/Makefile.in
-+++ kbugbuster/pics/Makefile.in
+diff -ur kdesdk-3.5.5.old/kbugbuster/pics/Makefile.in kdesdk-3.5.5/kbugbuster/pics/Makefile.in
+--- kdesdk-3.5.5.old/kbugbuster/pics/Makefile.in	2006-10-02 20:29:26.000000000 +0200
++++ kdesdk-3.5.5/kbugbuster/pics/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -61559,20 +58863,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61582,7 +58873,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61602,7 +58893,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -61621,7 +58912,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -61639,7 +58930,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -368,7 +383,7 @@
+@@ -374,7 +383,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -61648,7 +58939,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -406,9 +421,9 @@
+@@ -383,9 +392,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/pics/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/pics/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kbugbuster/pics/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kbugbuster/pics/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -395,9 +404,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/pics/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -412,9 +421,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61660,8 +58975,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kcachegrind/converters/Makefile.in
-+++ kcachegrind/converters/Makefile.in
+@@ -588,9 +597,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kbugbuster/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kbugbuster/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kbugbuster/pics/Makefile
++	  $(AUTOMAKE) --gnu  kbugbuster/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kbugbuster/pics/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kcachegrind/converters/Makefile.in kdesdk-3.5.5/kcachegrind/converters/Makefile.in
+--- kdesdk-3.5.5.old/kcachegrind/converters/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kcachegrind/converters/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -98,6 +98,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -61670,20 +58998,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -146,6 +147,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -177,6 +184,9 @@
+@@ -183,6 +184,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61693,7 +59008,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -217,18 +227,16 @@
+@@ -223,18 +227,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61713,7 +59028,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -249,14 +257,18 @@
+@@ -255,14 +257,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -61732,7 +59047,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -323,14 +335,17 @@
+@@ -329,14 +335,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -61750,7 +59065,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -362,7 +377,7 @@
+@@ -368,7 +377,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -61759,7 +59074,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -400,9 +415,9 @@
+@@ -377,9 +386,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/converters/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/converters/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kcachegrind/converters/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kcachegrind/converters/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -389,9 +398,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/converters/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/converters/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/converters/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/converters/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/converters/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -406,9 +415,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61771,8 +59110,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
---- kcachegrind/kcachegrind/Makefile.in
-+++ kcachegrind/kcachegrind/Makefile.in
+@@ -584,9 +593,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/converters/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/converters/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/converters/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/converters/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/converters/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kcachegrind/kcachegrind/Makefile.in kdesdk-3.5.5/kcachegrind/kcachegrind/Makefile.in
+--- kdesdk-3.5.5.old/kcachegrind/kcachegrind/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kcachegrind/kcachegrind/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -175,6 +175,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -61781,20 +59133,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -223,6 +224,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -254,6 +261,9 @@
+@@ -260,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61804,7 +59143,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -294,18 +304,16 @@
+@@ -300,18 +304,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61824,7 +59163,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -326,14 +334,18 @@
+@@ -332,14 +334,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -61843,7 +59182,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -400,14 +412,17 @@
+@@ -406,14 +412,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -61861,7 +59200,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -500,7 +515,7 @@
+@@ -506,7 +515,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61870,7 +59209,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +553,9 @@
+@@ -515,9 +524,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/kcachegrind/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/kcachegrind/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kcachegrind/kcachegrind/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kcachegrind/kcachegrind/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -527,9 +536,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/kcachegrind/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/kcachegrind/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/kcachegrind/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/kcachegrind/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/kcachegrind/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -544,9 +553,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61882,17 +59245,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1054,7 +1069,7 @@
- 	-rm -f  coverageview.moc multiview.moc instrview.moc callgraphview.moc dumpselection.moc partgraph.moc sourceview.moc configdlg.moc functionselection.moc stackselection.moc treemap.moc callview.moc costtypeview.moc toplevel.moc partview.moc loader.moc callmapview.moc partselection.moc tabview.moc
+@@ -1100,9 +1109,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/kcachegrind/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/kcachegrind/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/kcachegrind/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/kcachegrind/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/kcachegrind/Makefile.in
  
- #>+ 2
--KDE_DIST=pool.h callgraphview.h dumpselectionbase.ui tabview.h partlistitem.h instrview.h callview.h callitem.h instritem.h sourceview.h toplevel.h coverageview.h dumpmanager.cpp partgraph.h stackbrowser.h subcost.h dumpselection.h stackselectionbase.ui sourceitem.h functionselection.h partselectionbase.ui costtypeitem.h functionselectionbase.ui configdlg.h stackitem.h tips coverageitem.h tracedata.h traceitemview.h fixcost.h costlistitem.h configdlgbase.ui stackselection.h dumpselection.cpp configuration.h treemap.h callmapview.h multiview.h costtypeview.h utils.h Makefile.in listutils.h dumpmanager.h partselection.h coverage.h loader.h partview.h functionitem.h lo32-app-kcachegrind.png lo16-app-kcachegrind.png Makefile.am 
-+KDE_DIST=pool.h callgraphview.h tabview.h dumpselectionbase.ui partlistitem.h instrview.h callview.h callitem.h instritem.h sourceview.h toplevel.h coverageview.h dumpmanager.cpp partgraph.h stackbrowser.h dumpselection.h subcost.h stackselectionbase.ui partselectionbase.ui functionselection.h sourceitem.h costtypeitem.h functionselectionbase.ui configdlg.h stackitem.h tips coverageitem.h tracedata.h traceitemview.h fixcost.h costlistitem.h configdlgbase.ui stackselection.h dumpselection.cpp configuration.h treemap.h callmapview.h multiview.h costtypeview.h utils.h Makefile.in listutils.h dumpmanager.h partselection.h loader.h coverage.h partview.h functionitem.h lo32-app-kcachegrind.png lo16-app-kcachegrind.png Makefile.am 
  
- #>+ 7
- clean-ui:
---- kcachegrind/Makefile.in
-+++ kcachegrind/Makefile.in
+diff -ur kdesdk-3.5.5.old/kcachegrind/Makefile.in kdesdk-3.5.5/kcachegrind/Makefile.in
+--- kdesdk-3.5.5.old/kcachegrind/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kcachegrind/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -113,6 +113,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -61901,20 +59268,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -161,6 +162,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -192,6 +199,9 @@
+@@ -198,6 +199,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61924,7 +59278,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -232,18 +242,16 @@
+@@ -238,18 +242,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61944,7 +59298,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -264,14 +272,18 @@
+@@ -270,14 +272,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -61963,7 +59317,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -338,14 +350,17 @@
+@@ -344,14 +350,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -61981,7 +59335,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -379,7 +394,7 @@
+@@ -385,7 +394,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -61990,7 +59344,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -417,9 +432,9 @@
+@@ -394,9 +403,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kcachegrind/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kcachegrind/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -406,9 +415,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -423,9 +432,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62002,8 +59380,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  version.h: $(top_builddir)/config.status $(srcdir)/version.h.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
---- kcachegrind/pics/hicolor/Makefile.in
-+++ kcachegrind/pics/hicolor/Makefile.in
+@@ -733,9 +742,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kcachegrind/pics/hicolor/Makefile.in kdesdk-3.5.5/kcachegrind/pics/hicolor/Makefile.in
+--- kdesdk-3.5.5.old/kcachegrind/pics/hicolor/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kcachegrind/pics/hicolor/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62012,20 +59403,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62035,7 +59413,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62055,7 +59433,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62074,7 +59452,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62092,7 +59470,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -357,7 +372,7 @@
+@@ -363,7 +372,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62101,7 +59479,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -395,9 +410,9 @@
+@@ -372,9 +381,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/pics/hicolor/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/pics/hicolor/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kcachegrind/pics/hicolor/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kcachegrind/pics/hicolor/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -384,9 +393,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/pics/hicolor/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/pics/hicolor/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/pics/hicolor/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/pics/hicolor/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/hicolor/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -401,9 +410,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62113,35 +59515,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -549,21 +564,21 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-torec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/torec.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-fromrec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png
- 	$(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/hi22-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions/percent.png
--	$(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/hi32-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions/percent.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/percent.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-fromrec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-recrec.png $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/recrec.png
-+	$(mkinstalldirs) $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-percent.png $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions/percent.png
+@@ -581,9 +590,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/pics/hicolor/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/pics/hicolor/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/pics/hicolor/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/pics/hicolor/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/hicolor/Makefile.in
  
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/torec.png
--	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png
- 	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/22x22/actions/percent.png
--	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions/percent.png
- 	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/percent.png
-+	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/fromrec.png
- 	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/16x16/actions/recrec.png
-+	-rm -f $(DESTDIR)$(kcachegrindicondir)/hicolor/32x32/actions/percent.png
  
- #>+ 15
- force-reedit:
---- kcachegrind/pics/Makefile.in
-+++ kcachegrind/pics/Makefile.in
+diff -ur kdesdk-3.5.5.old/kcachegrind/pics/Makefile.in kdesdk-3.5.5/kcachegrind/pics/Makefile.in
+--- kdesdk-3.5.5.old/kcachegrind/pics/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kcachegrind/pics/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62150,20 +59538,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62173,7 +59548,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62193,7 +59568,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62212,7 +59587,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62230,7 +59605,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -374,7 +389,7 @@
+@@ -380,7 +389,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -62239,7 +59614,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -412,9 +427,9 @@
+@@ -389,9 +398,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/pics/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/pics/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kcachegrind/pics/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kcachegrind/pics/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -401,9 +410,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/pics/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -418,9 +427,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62251,8 +59650,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdeaccounts-plugin/Makefile.in
-+++ kdeaccounts-plugin/Makefile.in
+@@ -722,9 +731,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcachegrind/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcachegrind/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcachegrind/pics/Makefile
++	  $(AUTOMAKE) --gnu  kcachegrind/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kcachegrind/pics/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kdeaccounts-plugin/Makefile.in kdesdk-3.5.5/kdeaccounts-plugin/Makefile.in
+--- kdesdk-3.5.5.old/kdeaccounts-plugin/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kdeaccounts-plugin/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -139,6 +139,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62261,20 +59673,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,6 +188,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -218,6 +225,9 @@
+@@ -224,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62284,7 +59683,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -258,18 +268,16 @@
+@@ -264,18 +268,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62304,7 +59703,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +298,18 @@
+@@ -296,14 +298,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62323,7 +59722,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +376,17 @@
+@@ -370,14 +376,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62341,7 +59740,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -413,7 +428,7 @@
+@@ -419,7 +428,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62350,7 +59749,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +466,9 @@
+@@ -428,9 +437,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kdeaccounts-plugin/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kdeaccounts-plugin/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kdeaccounts-plugin/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kdeaccounts-plugin/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -440,9 +449,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kdeaccounts-plugin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kdeaccounts-plugin/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kdeaccounts-plugin/Makefile
++	  $(AUTOMAKE) --gnu  kdeaccounts-plugin/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kdeaccounts-plugin/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -457,9 +466,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62362,8 +59785,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/c++/Makefile.in
-+++ kfile-plugins/c++/Makefile.in
+@@ -767,9 +776,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kdeaccounts-plugin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kdeaccounts-plugin/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kdeaccounts-plugin/Makefile
++	  $(AUTOMAKE) --gnu  kdeaccounts-plugin/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kdeaccounts-plugin/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kfile-plugins/c++/Makefile.in kdesdk-3.5.5/kfile-plugins/c++/Makefile.in
+--- kdesdk-3.5.5.old/kfile-plugins/c++/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kfile-plugins/c++/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -140,6 +140,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62372,20 +59808,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -188,6 +189,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -219,6 +226,9 @@
+@@ -225,6 +226,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62395,7 +59818,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -259,18 +269,16 @@
+@@ -265,18 +269,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62415,7 +59838,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -291,14 +299,18 @@
+@@ -297,14 +299,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62434,7 +59857,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -365,14 +377,17 @@
+@@ -371,14 +377,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62452,7 +59875,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -417,7 +432,7 @@
+@@ -423,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62461,7 +59884,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +470,9 @@
+@@ -432,9 +441,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/c++/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/c++/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kfile-plugins/c++/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kfile-plugins/c++/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/c++/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/c++/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/c++/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/c++/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/c++/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -461,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62473,8 +59920,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/diff/Makefile.in
-+++ kfile-plugins/diff/Makefile.in
+@@ -782,9 +791,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/c++/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/c++/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/c++/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/c++/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/c++/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kfile-plugins/diff/Makefile.in kdesdk-3.5.5/kfile-plugins/diff/Makefile.in
+--- kdesdk-3.5.5.old/kfile-plugins/diff/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kfile-plugins/diff/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -140,6 +140,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62483,20 +59943,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -188,6 +189,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -219,6 +226,9 @@
+@@ -225,6 +226,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62506,7 +59953,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -259,18 +269,16 @@
+@@ -265,18 +269,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62526,7 +59973,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -291,14 +299,18 @@
+@@ -297,14 +299,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62545,7 +59992,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -365,14 +377,17 @@
+@@ -371,14 +377,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62563,7 +60010,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -417,7 +432,7 @@
+@@ -423,7 +432,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62572,7 +60019,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +470,9 @@
+@@ -432,9 +441,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/diff/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/diff/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kfile-plugins/diff/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kfile-plugins/diff/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/diff/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/diff/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/diff/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/diff/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/diff/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -461,9 +470,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62584,8 +60055,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kfile-plugins/Makefile.in
-+++ kfile-plugins/Makefile.in
+@@ -782,9 +791,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/diff/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/diff/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/diff/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/diff/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/diff/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kfile-plugins/Makefile.in kdesdk-3.5.5/kfile-plugins/Makefile.in
+--- kdesdk-3.5.5.old/kfile-plugins/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kfile-plugins/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62594,20 +60078,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62617,7 +60088,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62637,7 +60108,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62656,7 +60127,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62674,7 +60145,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -372,7 +387,7 @@
+@@ -378,7 +387,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -62683,7 +60154,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -410,9 +425,9 @@
+@@ -387,9 +396,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kfile-plugins/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kfile-plugins/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -399,9 +408,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -416,9 +425,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62695,8 +60190,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kfile-plugins/ts/Makefile.in
-+++ kfile-plugins/ts/Makefile.in
+@@ -720,9 +729,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kfile-plugins/ts/Makefile.in kdesdk-3.5.5/kfile-plugins/ts/Makefile.in
+--- kdesdk-3.5.5.old/kfile-plugins/ts/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kfile-plugins/ts/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -140,6 +140,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62705,20 +60213,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -188,6 +189,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -219,6 +226,9 @@
+@@ -225,6 +226,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62728,7 +60223,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -259,18 +269,16 @@
+@@ -265,18 +269,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62748,7 +60243,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -291,14 +299,18 @@
+@@ -297,14 +299,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62767,7 +60262,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -365,14 +377,17 @@
+@@ -371,14 +377,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62785,7 +60280,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -415,7 +430,7 @@
+@@ -421,7 +430,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62794,7 +60289,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -453,9 +468,9 @@
+@@ -430,9 +439,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/ts/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/ts/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kfile-plugins/ts/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kfile-plugins/ts/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -442,9 +451,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/ts/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/ts/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/ts/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/ts/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/ts/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -459,9 +468,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62806,8 +60325,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/Makefile.in
-+++ kioslave/Makefile.in
+@@ -780,9 +789,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/ts/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/ts/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kfile-plugins/ts/Makefile
++	  $(AUTOMAKE) --gnu  kfile-plugins/ts/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/ts/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kioslave/Makefile.in kdesdk-3.5.5/kioslave/Makefile.in
+--- kdesdk-3.5.5.old/kioslave/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kioslave/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62816,20 +60348,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62839,7 +60358,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62859,7 +60378,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62878,7 +60397,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62896,7 +60415,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -373,7 +388,7 @@
+@@ -379,7 +388,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -62905,7 +60424,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -411,9 +426,9 @@
+@@ -388,9 +397,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kioslave/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kioslave/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -400,9 +409,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -417,9 +426,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62917,8 +60460,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kioslave/svn/icons/Makefile.in
-+++ kioslave/svn/icons/Makefile.in
+@@ -721,9 +730,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kioslave/svn/icons/Makefile.in kdesdk-3.5.5/kioslave/svn/icons/Makefile.in
+--- kdesdk-3.5.5.old/kioslave/svn/icons/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kioslave/svn/icons/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -62927,20 +60483,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62950,7 +60493,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62970,7 +60513,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62989,7 +60532,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -63007,7 +60550,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -356,7 +371,7 @@
+@@ -362,7 +371,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63016,7 +60559,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -394,9 +409,9 @@
+@@ -371,9 +380,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/icons/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/icons/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kioslave/svn/icons/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kioslave/svn/icons/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -383,9 +392,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/icons/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/icons/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/icons/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/icons/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/icons/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -400,9 +409,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63028,185 +60595,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -539,7 +554,7 @@
- .NOEXPORT:
+@@ -656,9 +665,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/icons/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/icons/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/icons/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/icons/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/icons/Makefile.in
  
- #>+ 2
--KDE_DIST=cr64-action-svn_branch.png cr22-action-svn_merge.png cr16-action-svn_status.png cr64-action-svn_merge.png cr128-action-svn_add.png cr64-action-svn_add.png cr48-action-svn_add.png crsc-action-svn_status.svgz crsc-action-svn_add.svgz cr48-action-svn_branch.png cr22-action-svn_switch.png cr128-action-svn_switch.png cr32-action-svn_remove.png crsc-action-svn_merge.svgz cr22-action-svn_add.png crsc-action-svn_remove.svgz cr16-action-svn_switch.png cr32-action-svn_add.png cr128-action-svn_remove.png cr48-action-svn_status.png cr22-action-svn_remove.png cr64-action-svn_remove.png cr32-action-svn_branch.png cr64-action-svn_switch.png cr16-action-svn_merge.png cr22-action-svn_status.png cr16-action-svn_branch.png cr16-action-svn_add.png cr128-action-svn_branch.png cr32-action-svn_merge.png cr128-action-svn_merge.png cr32-action-svn_switch.png cr48-action-svn_merge.png crsc-action-svn_branch.svgz cr64-action-svn_status.png crsc-action-svn_switch.svgz Makefile.in cr32-action-svn_status.png cr128-action-svn_status.png cr48-action-svn_switch.png cr16-action-svn_remove.png Makefile.am cr48-action-svn_remove.png cr22-action-svn_branch.png 
-+KDE_DIST=cr64-action-svn_branch.png cr16-action-svn_status.png cr22-action-svn_merge.png cr64-action-svn_merge.png cr128-action-svn_add.png cr64-action-svn_add.png cr48-action-svn_add.png crsc-action-svn_status.svgz crsc-action-svn_add.svgz cr48-action-svn_branch.png cr22-action-svn_switch.png cr128-action-svn_switch.png cr32-action-svn_remove.png crsc-action-svn_merge.svgz cr22-action-svn_add.png cr16-action-svn_switch.png cr32-action-svn_add.png crsc-action-svn_remove.svgz cr128-action-svn_remove.png cr22-action-svn_remove.png cr48-action-svn_status.png cr64-action-svn_remove.png cr32-action-svn_branch.png cr16-action-svn_merge.png cr64-action-svn_switch.png cr22-action-svn_status.png cr16-action-svn_branch.png cr128-action-svn_branch.png cr16-action-svn_add.png cr32-action-svn_merge.png cr128-action-svn_merge.png cr32-action-svn_switch.png cr48-action-svn_merge.png crsc-action-svn_branch.svgz cr64-action-svn_status.png crsc-action-svn_switch.svgz Makefile.in cr32-action-svn_status.png cr48-action-svn_switch.png cr128-action-svn_status.png cr16-action-svn_remove.png Makefile.am cr48-action-svn_remove.png cr22-action-svn_branch.png 
  
- #>+ 2
- docs-am:
-@@ -547,98 +562,98 @@
- #>+ 95
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
--	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_merge.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_add.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_branch.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_add.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_branch.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_add.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
--	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_merge.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_merge.svgz
--	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_switch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_switch.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_remove.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_branch.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_add.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_add.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_status.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_status.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_remove.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_merge.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_merge.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_switch.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_merge.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
--	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_branch.png
--	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_remove.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
--	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_remove.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_branch.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_remove.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_merge.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_merge.png
--	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_switch.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_switch.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_status.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_status.svgz
--	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_merge.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_status.png
--	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_branch.png
--	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_add.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_remove.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_remove.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_switch.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_switch.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_merge.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_merge.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_switch.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_switch.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_branch.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_add.png
--	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_merge.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_merge.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_branch.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_status.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_add.png
--	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_add.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_branch.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_merge.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_merge.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_switch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_switch.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_status.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_branch.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_remove.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_branch.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_remove.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_branch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_branch.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_remove.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_switch.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-action-svn_add.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_add.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_branch.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_branch.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_remove.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_remove.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_switch.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-svn_switch.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_switch.png
--	$(INSTALL_DATA) $(srcdir)/cr128-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_status.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_add.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_add.svgz
--	$(INSTALL_DATA) $(srcdir)/cr32-action-svn_status.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_status.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_branch.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_branch.svgz
--	$(INSTALL_DATA) $(srcdir)/crsc-action-svn_remove.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_remove.svgz
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_merge.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_status.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_merge.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_switch.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_branch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_merge.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_merge.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_switch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_merge.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_branch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_add.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_branch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_merge.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_merge.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_switch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_switch.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_branch.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_add.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_status.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_merge.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_merge.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_merge.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_status.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_branch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_remove.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_switch.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_switch.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_merge.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_switch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_switch.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_branch.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_merge.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_merge.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_branch.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_status.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_add.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_branch.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_merge.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_switch.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/svn_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_status.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_branch.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_branch.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_branch.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/svn_remove.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_switch.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/svn_add.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_branch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_remove.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_switch.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/svn_switch.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/svn_status.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_add.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/svn_status.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_branch.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/svn_remove.svgz
- 
- #>+ 15
- force-reedit:
---- kioslave/svn/ksvnd/Makefile.in
-+++ kioslave/svn/ksvnd/Makefile.in
+diff -ur kdesdk-3.5.5.old/kioslave/svn/ksvnd/Makefile.in kdesdk-3.5.5/kioslave/svn/ksvnd/Makefile.in
+--- kdesdk-3.5.5.old/kioslave/svn/ksvnd/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kioslave/svn/ksvnd/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -139,6 +139,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -63215,20 +60618,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,6 +188,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -218,6 +225,9 @@
+@@ -224,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63238,7 +60628,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -258,18 +268,16 @@
+@@ -264,18 +268,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63258,7 +60648,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +298,18 @@
+@@ -296,14 +298,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -63277,7 +60667,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +376,17 @@
+@@ -370,14 +376,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -63295,7 +60685,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -414,7 +429,7 @@
+@@ -420,7 +429,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63304,7 +60694,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +467,9 @@
+@@ -429,9 +438,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/ksvnd/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/ksvnd/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kioslave/svn/ksvnd/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kioslave/svn/ksvnd/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -441,9 +450,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/ksvnd/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/ksvnd/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/ksvnd/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/ksvnd/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/ksvnd/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -458,9 +467,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63316,8 +60730,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/svn/Makefile.in
-+++ kioslave/svn/Makefile.in
+@@ -776,9 +785,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/ksvnd/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/ksvnd/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/ksvnd/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/ksvnd/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/ksvnd/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kioslave/svn/Makefile.in kdesdk-3.5.5/kioslave/svn/Makefile.in
+--- kdesdk-3.5.5.old/kioslave/svn/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kioslave/svn/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -151,6 +151,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -63326,20 +60753,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -199,6 +200,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -230,6 +237,9 @@
+@@ -236,6 +237,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63349,7 +60763,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -270,18 +280,16 @@
+@@ -276,18 +280,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63369,7 +60783,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -302,14 +310,18 @@
+@@ -308,14 +310,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -63388,7 +60802,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -376,14 +388,17 @@
+@@ -382,14 +388,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -63406,7 +60820,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -421,7 +436,7 @@
+@@ -427,7 +436,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63415,7 +60829,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -459,9 +474,9 @@
+@@ -436,9 +445,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kioslave/svn/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kioslave/svn/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -448,9 +457,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -465,9 +474,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63427,8 +60865,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/svn/svnhelper/Makefile.in
-+++ kioslave/svn/svnhelper/Makefile.in
+@@ -879,9 +888,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kioslave/svn/svnhelper/Makefile.in kdesdk-3.5.5/kioslave/svn/svnhelper/Makefile.in
+--- kdesdk-3.5.5.old/kioslave/svn/svnhelper/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kioslave/svn/svnhelper/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -139,6 +139,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -63437,20 +60888,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,6 +188,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -218,6 +225,9 @@
+@@ -224,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63460,7 +60898,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -258,18 +268,16 @@
+@@ -264,18 +268,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63480,7 +60918,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +298,18 @@
+@@ -296,14 +298,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -63499,7 +60937,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +376,17 @@
+@@ -370,14 +376,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -63517,7 +60955,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -414,7 +429,7 @@
+@@ -420,7 +429,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63526,7 +60964,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -452,9 +467,9 @@
+@@ -429,9 +438,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/svnhelper/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/svnhelper/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kioslave/svn/svnhelper/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kioslave/svn/svnhelper/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -441,9 +450,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/svnhelper/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/svnhelper/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/svnhelper/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/svnhelper/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/svnhelper/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -458,9 +467,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63538,8 +61000,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kmtrace/Makefile.in
-+++ kmtrace/Makefile.in
+@@ -763,9 +772,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslave/svn/svnhelper/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslave/svn/svnhelper/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kioslave/svn/svnhelper/Makefile
++	  $(AUTOMAKE) --gnu  kioslave/svn/svnhelper/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kioslave/svn/svnhelper/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kmtrace/Makefile.in kdesdk-3.5.5/kmtrace/Makefile.in
+--- kdesdk-3.5.5.old/kmtrace/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kmtrace/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -80,11 +80,12 @@
      *) f=$$p;; \
    esac;
@@ -63577,20 +61052,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -257,6 +259,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -288,6 +296,9 @@
+@@ -294,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63600,7 +61062,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -328,18 +339,16 @@
+@@ -334,18 +339,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63620,7 +61082,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,14 +369,18 @@
+@@ -366,14 +369,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -63639,7 +61101,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -434,14 +447,17 @@
+@@ -440,14 +447,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -63657,7 +61119,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -475,9 +491,10 @@
+@@ -481,9 +491,10 @@
  kmmatch_SOURCES = match.cpp
  kmmatch_LDFLAGS = $(all_libraries)
  bin_SCRIPTS = kminspector
@@ -63670,7 +61132,7 @@
  libktrace_la_LDFLAGS = -avoid-version
  libktrace_la_SOURCES = ksotrace.cpp ktrace.c
  libktrace_la_LIBADD = $(LIBDL)
-@@ -490,7 +507,7 @@
+@@ -496,7 +507,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -63679,7 +61141,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,74 +545,74 @@
+@@ -505,9 +516,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmtrace/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmtrace/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kmtrace/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kmtrace/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -517,9 +528,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmtrace/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmtrace/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kmtrace/Makefile
++	  $(AUTOMAKE) --gnu  kmtrace/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kmtrace/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -534,74 +545,74 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63783,7 +61269,7 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@@ -831,10 +848,8 @@
+@@ -837,10 +848,8 @@
  check: check-am
  all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
  		$(DATA) $(HEADERS)
@@ -63795,7 +61281,7 @@
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-am
-@@ -865,11 +880,11 @@
+@@ -871,11 +880,11 @@
  #>+ 1
  clean: kde-rpo-clean  clean-am
  
@@ -63811,7 +61297,7 @@
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -887,10 +902,10 @@
+@@ -893,10 +902,10 @@
  
  info-am:
  
@@ -63825,7 +61311,7 @@
  
  install-info: install-info-am
  
-@@ -918,26 +933,26 @@
+@@ -924,26 +933,26 @@
  
  uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
  	uninstall-excludeDATA uninstall-includeHEADERS \
@@ -63869,8 +61355,21 @@
  
  
  ktrace_s.c: $(srcdir)/ktrace.c
---- kompare/interfaces/Makefile.in
-+++ kompare/interfaces/Makefile.in
+@@ -968,9 +977,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kmtrace/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kmtrace/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kmtrace/Makefile
++	  $(AUTOMAKE) --gnu  kmtrace/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kmtrace/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kompare/interfaces/Makefile.in kdesdk-3.5.5/kompare/interfaces/Makefile.in
+--- kdesdk-3.5.5.old/kompare/interfaces/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kompare/interfaces/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -133,6 +133,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -63879,20 +61378,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -181,6 +182,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -212,6 +219,9 @@
+@@ -218,6 +219,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63902,7 +61388,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -252,18 +262,16 @@
+@@ -258,18 +262,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63922,7 +61408,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -284,14 +292,18 @@
+@@ -290,14 +292,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -63941,7 +61427,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -358,14 +370,17 @@
+@@ -364,14 +370,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -63959,7 +61445,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -402,7 +417,7 @@
+@@ -408,7 +417,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63968,7 +61454,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -440,9 +455,9 @@
+@@ -417,9 +426,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/interfaces/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/interfaces/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kompare/interfaces/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kompare/interfaces/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -429,9 +438,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/interfaces/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/interfaces/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/interfaces/Makefile
++	  $(AUTOMAKE) --gnu  kompare/interfaces/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/interfaces/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -446,9 +455,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63980,8 +61490,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kompare/komparenavtreepart/Makefile.in
-+++ kompare/komparenavtreepart/Makefile.in
+@@ -730,9 +739,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/interfaces/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/interfaces/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/interfaces/Makefile
++	  $(AUTOMAKE) --gnu  kompare/interfaces/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/interfaces/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kompare/komparenavtreepart/Makefile.in kdesdk-3.5.5/kompare/komparenavtreepart/Makefile.in
+--- kdesdk-3.5.5.old/kompare/komparenavtreepart/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kompare/komparenavtreepart/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -146,6 +146,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -63990,20 +61513,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -194,6 +195,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -225,6 +232,9 @@
+@@ -231,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64013,7 +61523,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -265,18 +275,16 @@
+@@ -271,18 +275,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64033,7 +61543,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -297,14 +305,18 @@
+@@ -303,14 +305,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -64052,7 +61562,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -371,14 +383,17 @@
+@@ -377,14 +383,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -64070,7 +61580,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -431,7 +446,7 @@
+@@ -437,7 +446,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64079,7 +61589,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -469,9 +484,9 @@
+@@ -446,9 +455,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/komparenavtreepart/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/komparenavtreepart/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kompare/komparenavtreepart/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kompare/komparenavtreepart/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -458,9 +467,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/komparenavtreepart/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/komparenavtreepart/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/komparenavtreepart/Makefile
++	  $(AUTOMAKE) --gnu  kompare/komparenavtreepart/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/komparenavtreepart/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -475,9 +484,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64091,8 +61625,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kompare/komparepart/Makefile.in
-+++ kompare/komparepart/Makefile.in
+@@ -793,9 +802,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/komparenavtreepart/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/komparenavtreepart/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/komparenavtreepart/Makefile
++	  $(AUTOMAKE) --gnu  kompare/komparenavtreepart/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/komparenavtreepart/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kompare/komparepart/Makefile.in kdesdk-3.5.5/kompare/komparepart/Makefile.in
+--- kdesdk-3.5.5.old/kompare/komparepart/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kompare/komparepart/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -155,6 +155,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -64101,20 +61648,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -203,6 +204,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -234,6 +241,9 @@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64124,7 +61658,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -274,18 +284,16 @@
+@@ -280,18 +284,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64144,7 +61678,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -306,14 +314,18 @@
+@@ -312,14 +314,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -64163,7 +61697,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -380,14 +392,17 @@
+@@ -386,14 +392,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -64181,7 +61715,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -471,7 +486,7 @@
+@@ -477,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64190,7 +61724,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +524,9 @@
+@@ -486,9 +495,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/komparepart/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/komparepart/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kompare/komparepart/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kompare/komparepart/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -498,9 +507,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/komparepart/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/komparepart/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/komparepart/Makefile
++	  $(AUTOMAKE) --gnu  kompare/komparepart/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/komparepart/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -515,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64202,66 +61760,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -836,11 +851,11 @@
- mocs: kompareprefdlg.moc
+@@ -905,9 +914,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/komparepart/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/komparepart/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/komparepart/Makefile
++	  $(AUTOMAKE) --gnu  kompare/komparepart/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/komparepart/Makefile.in
  
- #>+ 3
--kompare_part.moc: $(srcdir)/kompare_part.h
--	$(MOC) $(srcdir)/kompare_part.h -o kompare_part.moc
-+komparesaveoptionswidget.moc: $(srcdir)/komparesaveoptionswidget.h
-+	$(MOC) $(srcdir)/komparesaveoptionswidget.h -o komparesaveoptionswidget.moc
  
- #>+ 2
--mocs: kompare_part.moc
-+mocs: komparesaveoptionswidget.moc
- 
- #>+ 3
- kompareconnectwidget.moc: $(srcdir)/kompareconnectwidget.h
-@@ -850,11 +865,11 @@
- mocs: kompareconnectwidget.moc
- 
- #>+ 3
--komparesaveoptionswidget.moc: $(srcdir)/komparesaveoptionswidget.h
--	$(MOC) $(srcdir)/komparesaveoptionswidget.h -o komparesaveoptionswidget.moc
-+kompare_part.moc: $(srcdir)/kompare_part.h
-+	$(MOC) $(srcdir)/kompare_part.h -o kompare_part.moc
- 
- #>+ 2
--mocs: komparesaveoptionswidget.moc
-+mocs: kompare_part.moc
- 
- #>+ 3
- komparesplitter.moc: $(srcdir)/komparesplitter.h
-@@ -872,7 +887,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  komparelistview.moc kompareprefdlg.moc kompare_part.moc kompareconnectwidget.moc komparesaveoptionswidget.moc komparesplitter.moc kompare_qsplitter.moc.cpp
-+	-rm -f  komparelistview.moc kompareprefdlg.moc komparesaveoptionswidget.moc kompareconnectwidget.moc kompare_part.moc komparesplitter.moc kompare_qsplitter.moc.cpp
- 
- #>+ 2
- KDE_DIST=komparepartui.rc komparepart.desktop komparesaveoptionsbase.ui Makefile.in Makefile.am 
-@@ -928,7 +943,7 @@
- 
- 
- #>+ 11
--libkomparepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kompare_part.cpp $(srcdir)/kompareconnectwidget.cpp $(srcdir)/komparesplitter.cpp $(srcdir)/komparelistview.cpp $(srcdir)/kompareprefdlg.cpp $(srcdir)/komparesaveoptionswidget.cpp komparesaveoptionsbase.cpp kompare_qsplitter.moc.cpp  komparesaveoptionsbase.moc kompareprefdlg.moc kompareconnectwidget.moc komparelistview.moc kompare_part.moc komparesaveoptionswidget.moc komparesplitter.moc
-+libkomparepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kompare_part.cpp $(srcdir)/kompareconnectwidget.cpp $(srcdir)/komparesplitter.cpp $(srcdir)/komparelistview.cpp $(srcdir)/kompareprefdlg.cpp $(srcdir)/komparesaveoptionswidget.cpp komparesaveoptionsbase.cpp kompare_qsplitter.moc.cpp  komparesaveoptionsbase.moc kompareprefdlg.moc kompareconnectwidget.moc komparelistview.moc komparesaveoptionswidget.moc kompare_part.moc komparesplitter.moc
- 	@echo 'creating libkomparepart_la.all_cpp.cpp ...'; \
- 	rm -f libkomparepart_la.all_cpp.files libkomparepart_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkomparepart_la.all_cpp.final; \
-@@ -969,8 +984,8 @@
- kompare_part.lo: kompare_part.moc 
- komparelistview.o: komparelistview.moc 
- $(srcdir)/komparesplitter.cpp: komparesaveoptionsbase.h 
--kompareconnectwidget.lo: kompareconnectwidget.moc 
- komparesaveoptionswidget.lo: komparesaveoptionswidget.moc 
-+kompareconnectwidget.lo: kompareconnectwidget.moc 
- kompare_part.o: kompare_part.moc 
- $(srcdir)/komparesaveoptionswidget.cpp: komparesaveoptionsbase.h 
- $(srcdir)/kompare_part.cpp: komparesaveoptionsbase.h 
---- kompare/libdialogpages/Makefile.in
-+++ kompare/libdialogpages/Makefile.in
+diff -ur kdesdk-3.5.5.old/kompare/libdialogpages/Makefile.in kdesdk-3.5.5/kompare/libdialogpages/Makefile.in
+--- kdesdk-3.5.5.old/kompare/libdialogpages/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kompare/libdialogpages/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -135,6 +135,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -64270,20 +61783,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -183,6 +184,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -214,6 +221,9 @@
+@@ -220,6 +221,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64293,7 +61793,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -254,18 +264,16 @@
+@@ -260,18 +264,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64313,7 +61813,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -286,14 +294,18 @@
+@@ -292,14 +294,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -64332,7 +61832,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -360,14 +372,17 @@
+@@ -366,14 +372,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -64350,7 +61850,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -429,7 +444,7 @@
+@@ -435,7 +444,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64359,7 +61859,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +482,9 @@
+@@ -444,9 +453,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/libdialogpages/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/libdialogpages/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kompare/libdialogpages/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kompare/libdialogpages/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -456,9 +465,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/libdialogpages/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/libdialogpages/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/libdialogpages/Makefile
++	  $(AUTOMAKE) --gnu  kompare/libdialogpages/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/libdialogpages/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -473,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64371,122 +61895,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -705,53 +720,53 @@
- .NOEXPORT:
+@@ -786,9 +795,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/libdialogpages/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/libdialogpages/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/libdialogpages/Makefile
++	  $(AUTOMAKE) --gnu  kompare/libdialogpages/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/libdialogpages/Makefile.in
  
- #>+ 3
--viewsettings.moc: $(srcdir)/viewsettings.h
--	$(MOC) $(srcdir)/viewsettings.h -o viewsettings.moc
-+filessettings.moc: $(srcdir)/filessettings.h
-+	$(MOC) $(srcdir)/filessettings.h -o filessettings.moc
  
- #>+ 2
--mocs: viewsettings.moc
-+mocs: filessettings.moc
- 
- #>+ 3
--filespage.moc: $(srcdir)/filespage.h
--	$(MOC) $(srcdir)/filespage.h -o filespage.moc
-+viewsettings.moc: $(srcdir)/viewsettings.h
-+	$(MOC) $(srcdir)/viewsettings.h -o viewsettings.moc
- 
- #>+ 2
--mocs: filespage.moc
-+mocs: viewsettings.moc
- 
- #>+ 3
--settingsbase.moc: $(srcdir)/settingsbase.h
--	$(MOC) $(srcdir)/settingsbase.h -o settingsbase.moc
-+viewpage.moc: $(srcdir)/viewpage.h
-+	$(MOC) $(srcdir)/viewpage.h -o viewpage.moc
- 
- #>+ 2
--mocs: settingsbase.moc
-+mocs: viewpage.moc
- 
- #>+ 3
--diffsettings.moc: $(srcdir)/diffsettings.h
--	$(MOC) $(srcdir)/diffsettings.h -o diffsettings.moc
-+filespage.moc: $(srcdir)/filespage.h
-+	$(MOC) $(srcdir)/filespage.h -o filespage.moc
- 
- #>+ 2
--mocs: diffsettings.moc
-+mocs: filespage.moc
- 
- #>+ 3
--viewpage.moc: $(srcdir)/viewpage.h
--	$(MOC) $(srcdir)/viewpage.h -o viewpage.moc
-+diffpage.moc: $(srcdir)/diffpage.h
-+	$(MOC) $(srcdir)/diffpage.h -o diffpage.moc
- 
- #>+ 2
--mocs: viewpage.moc
-+mocs: diffpage.moc
- 
- #>+ 3
--filessettings.moc: $(srcdir)/filessettings.h
--	$(MOC) $(srcdir)/filessettings.h -o filessettings.moc
-+settingsbase.moc: $(srcdir)/settingsbase.h
-+	$(MOC) $(srcdir)/settingsbase.h -o settingsbase.moc
- 
- #>+ 2
--mocs: filessettings.moc
-+mocs: settingsbase.moc
- 
- #>+ 3
--diffpage.moc: $(srcdir)/diffpage.h
--	$(MOC) $(srcdir)/diffpage.h -o diffpage.moc
-+diffsettings.moc: $(srcdir)/diffsettings.h
-+	$(MOC) $(srcdir)/diffsettings.h -o diffsettings.moc
- 
- #>+ 2
--mocs: diffpage.moc
-+mocs: diffsettings.moc
- 
- #>+ 3
- pagebase.moc: $(srcdir)/pagebase.h
-@@ -762,7 +777,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  viewsettings.moc filespage.moc settingsbase.moc diffsettings.moc viewpage.moc filessettings.moc diffpage.moc pagebase.moc
-+	-rm -f  filessettings.moc viewsettings.moc viewpage.moc filespage.moc diffpage.moc settingsbase.moc diffsettings.moc pagebase.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am 
-@@ -809,7 +824,7 @@
- 
- 
- #>+ 11
--libdialogpages_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/settingsbase.cpp $(srcdir)/diffsettings.cpp $(srcdir)/filessettings.cpp $(srcdir)/viewsettings.cpp $(srcdir)/pagebase.cpp $(srcdir)/diffpage.cpp $(srcdir)/filespage.cpp $(srcdir)/viewpage.cpp  filessettings.moc viewpage.moc viewsettings.moc filespage.moc diffpage.moc settingsbase.moc diffsettings.moc pagebase.moc
-+libdialogpages_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/settingsbase.cpp $(srcdir)/diffsettings.cpp $(srcdir)/filessettings.cpp $(srcdir)/viewsettings.cpp $(srcdir)/pagebase.cpp $(srcdir)/diffpage.cpp $(srcdir)/filespage.cpp $(srcdir)/viewpage.cpp  viewpage.moc viewsettings.moc filessettings.moc filespage.moc settingsbase.moc diffpage.moc diffsettings.moc pagebase.moc
- 	@echo 'creating libdialogpages_la.all_cpp.cpp ...'; \
- 	rm -f libdialogpages_la.all_cpp.files libdialogpages_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libdialogpages_la.all_cpp.final; \
-@@ -850,16 +865,16 @@
- filespage.lo: filespage.moc 
- diffsettings.o: diffsettings.moc 
- nmcheck: 
--settingsbase.o: settingsbase.moc 
- viewpage.o: viewpage.moc 
-+settingsbase.o: settingsbase.moc 
- pagebase.lo: pagebase.moc 
- viewsettings.lo: viewsettings.moc 
--diffsettings.lo: diffsettings.moc 
- diffpage.lo: diffpage.moc 
-+diffsettings.lo: diffsettings.moc 
- viewsettings.o: viewsettings.moc 
- viewpage.lo: viewpage.moc 
- nmcheck-am: nmcheck
- filessettings.lo: filessettings.moc 
--settingsbase.lo: settingsbase.moc 
--filessettings.o: filessettings.moc 
- diffpage.o: diffpage.moc 
-+filessettings.o: filessettings.moc 
-+settingsbase.lo: settingsbase.moc 
---- kompare/libdiff2/Makefile.in
-+++ kompare/libdiff2/Makefile.in
+diff -ur kdesdk-3.5.5.old/kompare/libdiff2/Makefile.in kdesdk-3.5.5/kompare/libdiff2/Makefile.in
+--- kdesdk-3.5.5.old/kompare/libdiff2/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kompare/libdiff2/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -137,6 +137,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -64495,20 +61918,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -185,6 +186,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -216,6 +223,9 @@
+@@ -222,6 +223,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64518,7 +61928,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -256,18 +266,16 @@
+@@ -262,18 +266,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64538,7 +61948,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,14 +296,18 @@
+@@ -294,14 +296,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -64557,7 +61967,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -362,14 +374,17 @@
+@@ -368,14 +374,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -64575,7 +61985,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -435,7 +450,7 @@
+@@ -441,7 +450,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64584,7 +61994,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -473,9 +488,9 @@
+@@ -450,9 +459,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/libdiff2/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/libdiff2/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kompare/libdiff2/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kompare/libdiff2/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -462,9 +471,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/libdiff2/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/libdiff2/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/libdiff2/Makefile
++	  $(AUTOMAKE) --gnu  kompare/libdiff2/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/libdiff2/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -479,9 +488,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64596,8 +62030,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kompare/Makefile.in
-+++ kompare/Makefile.in
+@@ -761,9 +770,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/libdiff2/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/libdiff2/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/libdiff2/Makefile
++	  $(AUTOMAKE) --gnu  kompare/libdiff2/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/libdiff2/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kompare/Makefile.in kdesdk-3.5.5/kompare/Makefile.in
+--- kdesdk-3.5.5.old/kompare/Makefile.in	2006-10-02 20:29:27.000000000 +0200
++++ kdesdk-3.5.5/kompare/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -165,6 +165,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -64606,20 +62053,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -213,6 +214,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -244,6 +251,9 @@
+@@ -250,6 +251,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64629,7 +62063,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -284,18 +294,16 @@
+@@ -290,18 +294,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64649,7 +62083,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -316,14 +324,18 @@
+@@ -322,14 +324,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -64668,7 +62102,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -390,14 +402,17 @@
+@@ -396,14 +402,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -64686,7 +62120,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -458,7 +473,7 @@
+@@ -464,7 +473,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64695,7 +62129,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -496,9 +511,9 @@
+@@ -473,9 +482,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kompare/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kompare/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -485,9 +494,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/Makefile
++	  $(AUTOMAKE) --gnu  kompare/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -502,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64707,8 +62165,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kompare/pics/Makefile.in
-+++ kompare/pics/Makefile.in
+@@ -955,9 +964,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/Makefile
++	  $(AUTOMAKE) --gnu  kompare/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kompare/pics/Makefile.in kdesdk-3.5.5/kompare/pics/Makefile.in
+--- kdesdk-3.5.5.old/kompare/pics/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kompare/pics/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -94,6 +94,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -64717,20 +62188,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -142,6 +143,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -173,6 +180,9 @@
+@@ -179,6 +180,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64740,7 +62198,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -213,18 +223,16 @@
+@@ -219,18 +223,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64760,7 +62218,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -245,14 +253,18 @@
+@@ -251,14 +253,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -64779,7 +62237,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -319,14 +331,17 @@
+@@ -325,14 +331,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -64797,7 +62255,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -356,7 +371,7 @@
+@@ -362,7 +371,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -64806,7 +62264,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -394,9 +409,9 @@
+@@ -371,9 +380,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/pics/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/pics/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kompare/pics/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kompare/pics/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -383,9 +392,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/pics/Makefile
++	  $(AUTOMAKE) --gnu  kompare/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -400,9 +409,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64818,44 +62300,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -546,26 +561,26 @@
+@@ -583,9 +592,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kompare/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kompare/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kompare/pics/Makefile
++	  $(AUTOMAKE) --gnu  kompare/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kompare/pics/Makefile.in
  
- #>+ 22
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kompare.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kompare.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kompare.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kompare.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/hisc-app-kompare.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kompare.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kompare.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kompare.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kompare.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kompare.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kompare.png
  
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kompare.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kompare.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kompare.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kompare.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kompare.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kompare.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kompare.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kompare.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kompare.png
- 
- #>+ 15
- force-reedit:
---- kprofilemethod/Makefile.in
-+++ kprofilemethod/Makefile.in
+diff -ur kdesdk-3.5.5.old/kprofilemethod/Makefile.in kdesdk-3.5.5/kprofilemethod/Makefile.in
+--- kdesdk-3.5.5.old/kprofilemethod/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kprofilemethod/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -107,6 +107,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -64864,20 +62323,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -155,6 +156,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -186,6 +193,9 @@
+@@ -192,6 +193,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64887,7 +62333,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -226,18 +236,16 @@
+@@ -232,18 +236,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64907,7 +62353,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -258,14 +266,18 @@
+@@ -264,14 +266,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -64926,7 +62372,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -332,14 +344,17 @@
+@@ -338,14 +344,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -64944,7 +62390,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -369,7 +384,7 @@
+@@ -375,7 +384,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -64953,7 +62399,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -407,9 +422,9 @@
+@@ -384,9 +393,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kprofilemethod/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kprofilemethod/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kprofilemethod/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kprofilemethod/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -396,9 +405,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kprofilemethod/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kprofilemethod/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kprofilemethod/Makefile
++	  $(AUTOMAKE) --gnu  kprofilemethod/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kprofilemethod/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -413,9 +422,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64965,8 +62435,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kspy/Makefile.in
-+++ kspy/Makefile.in
+@@ -634,9 +643,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kprofilemethod/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kprofilemethod/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kprofilemethod/Makefile
++	  $(AUTOMAKE) --gnu  kprofilemethod/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kprofilemethod/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kspy/Makefile.in kdesdk-3.5.5/kspy/Makefile.in
+--- kdesdk-3.5.5.old/kspy/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kspy/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -149,6 +149,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -64975,20 +62458,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -197,6 +198,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -228,6 +235,9 @@
+@@ -234,6 +235,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64998,7 +62468,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -268,18 +278,16 @@
+@@ -274,18 +278,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65018,7 +62488,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -300,14 +308,18 @@
+@@ -306,14 +308,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65037,7 +62507,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -374,14 +386,17 @@
+@@ -380,14 +386,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65055,7 +62525,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -430,7 +445,7 @@
+@@ -436,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65064,7 +62534,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +483,9 @@
+@@ -445,9 +454,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kspy/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kspy/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kspy/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kspy/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -457,9 +466,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kspy/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kspy/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kspy/Makefile
++	  $(AUTOMAKE) --gnu  kspy/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kspy/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -474,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65076,61 +62570,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -783,18 +798,18 @@
- mocs: sigslotview.moc
+@@ -847,9 +856,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kspy/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kspy/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kspy/Makefile
++	  $(AUTOMAKE) --gnu  kspy/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kspy/Makefile.in
  
- #>+ 3
--receiversview.moc: $(srcdir)/receiversview.h
--	$(MOC) $(srcdir)/receiversview.h -o receiversview.moc
-+spy.moc: $(srcdir)/spy.h
-+	$(MOC) $(srcdir)/spy.h -o spy.moc
  
- #>+ 2
--mocs: receiversview.moc
-+mocs: spy.moc
- 
- #>+ 3
--spy.moc: $(srcdir)/spy.h
--	$(MOC) $(srcdir)/spy.h -o spy.moc
-+receiversview.moc: $(srcdir)/receiversview.h
-+	$(MOC) $(srcdir)/receiversview.h -o receiversview.moc
- 
- #>+ 2
--mocs: spy.moc
-+mocs: receiversview.moc
- 
- #>+ 3
- navview.moc: $(srcdir)/navview.h
-@@ -819,7 +834,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  sigslotview.moc receiversview.moc spy.moc navview.moc propsview.moc classinfoview.moc
-+	-rm -f  sigslotview.moc spy.moc receiversview.moc navview.moc propsview.moc classinfoview.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am 
-@@ -870,7 +885,7 @@
- 
- 
- #>+ 11
--libkspy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navviewitem.cpp $(srcdir)/propsview.cpp $(srcdir)/navview.cpp $(srcdir)/spy.cpp $(srcdir)/sigslotview.cpp $(srcdir)/receiversview.cpp $(srcdir)/classinfoview.cpp  sigslotview.moc spy.moc receiversview.moc propsview.moc navview.moc classinfoview.moc
-+libkspy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navviewitem.cpp $(srcdir)/propsview.cpp $(srcdir)/navview.cpp $(srcdir)/spy.cpp $(srcdir)/sigslotview.cpp $(srcdir)/receiversview.cpp $(srcdir)/classinfoview.cpp  sigslotview.moc receiversview.moc spy.moc propsview.moc navview.moc classinfoview.moc
- 	@echo 'creating libkspy_la.all_cpp.cpp ...'; \
- 	rm -f libkspy_la.all_cpp.files libkspy_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkspy_la.all_cpp.final; \
-@@ -907,8 +922,8 @@
- 
- #>+ 15
- classinfoview.lo: classinfoview.moc 
--spy.o: spy.moc 
- receiversview.lo: receiversview.moc 
-+spy.o: spy.moc 
- navview.o: navview.moc 
- receiversview.o: receiversview.moc 
- sigslotview.o: sigslotview.moc 
---- kstartperf/Makefile.in
-+++ kstartperf/Makefile.in
+diff -ur kdesdk-3.5.5.old/kstartperf/Makefile.in kdesdk-3.5.5/kstartperf/Makefile.in
+--- kdesdk-3.5.5.old/kstartperf/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kstartperf/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -150,6 +150,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65139,20 +62593,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -198,6 +199,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -229,6 +236,9 @@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65162,7 +62603,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -269,18 +279,16 @@
+@@ -275,18 +279,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65182,7 +62623,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -301,14 +309,18 @@
+@@ -307,14 +309,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65201,7 +62642,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -375,14 +387,17 @@
+@@ -381,14 +387,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65219,7 +62660,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -420,7 +435,7 @@
+@@ -426,7 +435,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -65228,7 +62669,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -458,9 +473,9 @@
+@@ -435,9 +444,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kstartperf/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kstartperf/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kstartperf/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kstartperf/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -447,9 +456,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kstartperf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kstartperf/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kstartperf/Makefile
++	  $(AUTOMAKE) --gnu  kstartperf/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kstartperf/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -464,9 +473,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65240,8 +62705,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kuiviewer/Makefile.in
-+++ kuiviewer/Makefile.in
+@@ -792,9 +801,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kstartperf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kstartperf/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kstartperf/Makefile
++	  $(AUTOMAKE) --gnu  kstartperf/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kstartperf/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kuiviewer/Makefile.in kdesdk-3.5.5/kuiviewer/Makefile.in
+--- kdesdk-3.5.5.old/kuiviewer/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kuiviewer/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -170,6 +170,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65250,20 +62728,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -249,6 +256,9 @@
+@@ -255,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65273,7 +62738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -289,18 +299,16 @@
+@@ -295,18 +299,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65293,7 +62758,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -321,14 +329,18 @@
+@@ -327,14 +329,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65312,7 +62777,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -395,14 +407,17 @@
+@@ -401,14 +407,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65330,7 +62795,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -479,7 +494,7 @@
+@@ -485,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65339,7 +62804,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +532,9 @@
+@@ -494,9 +503,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kuiviewer/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kuiviewer/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kuiviewer/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kuiviewer/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -506,9 +515,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kuiviewer/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kuiviewer/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kuiviewer/Makefile
++	  $(AUTOMAKE) --gnu  kuiviewer/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kuiviewer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -523,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65351,38 +62840,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -975,23 +990,23 @@
+@@ -1009,9 +1018,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kuiviewer/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kuiviewer/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kuiviewer/Makefile
++	  $(AUTOMAKE) --gnu  kuiviewer/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kuiviewer/Makefile.in
  
- #>+ 19
- install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/lo32-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuiviewer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuiviewer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kuiviewer.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/lo32-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuiviewer.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/lo16-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuiviewer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuiviewer.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/lo16-app-kuiviewer.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuiviewer.png
  
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuiviewer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kuiviewer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kuiviewer.png
--	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kuiviewer.png
--	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuiviewer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kuiviewer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kuiviewer.png
- 
- #>+ 15
- force-reedit:
---- kunittest/example/Makefile.in
-+++ kunittest/example/Makefile.in
+diff -ur kdesdk-3.5.5.old/kunittest/example/Makefile.in kdesdk-3.5.5/kunittest/example/Makefile.in
+--- kdesdk-3.5.5.old/kunittest/example/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kunittest/example/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -110,6 +110,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65391,20 +62863,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -158,6 +159,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -189,6 +196,9 @@
+@@ -195,6 +196,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65414,7 +62873,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -229,18 +239,16 @@
+@@ -235,18 +239,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65434,7 +62893,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -261,14 +269,18 @@
+@@ -267,14 +269,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65453,7 +62912,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -335,14 +347,17 @@
+@@ -341,14 +347,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65471,7 +62930,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -372,7 +387,7 @@
+@@ -378,7 +387,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -65480,7 +62939,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -410,9 +425,9 @@
+@@ -387,9 +396,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kunittest/example/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kunittest/example/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -399,9 +408,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/example/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/example/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/example/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -416,9 +425,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65492,8 +62975,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kunittest/example/module/Makefile.in
-+++ kunittest/example/module/Makefile.in
+@@ -720,9 +729,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/example/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/example/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/example/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kunittest/example/module/Makefile.in kdesdk-3.5.5/kunittest/example/module/Makefile.in
+--- kdesdk-3.5.5.old/kunittest/example/module/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kunittest/example/module/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -139,6 +139,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65502,20 +62998,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -187,6 +188,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -218,6 +225,9 @@
+@@ -224,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65525,7 +63008,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -258,18 +268,16 @@
+@@ -264,18 +268,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65545,7 +63028,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -290,14 +298,18 @@
+@@ -296,14 +298,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65564,7 +63047,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -364,14 +376,17 @@
+@@ -370,14 +376,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65582,7 +63065,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -411,7 +426,7 @@
+@@ -417,7 +426,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65591,7 +63074,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -449,9 +464,9 @@
+@@ -426,9 +435,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/module/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/module/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kunittest/example/module/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kunittest/example/module/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -438,9 +447,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/module/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/module/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/example/module/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/example/module/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/example/module/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -455,9 +464,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65603,8 +63110,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkLTLIBRARIES:
---- kunittest/example/simple/Makefile.in
-+++ kunittest/example/simple/Makefile.in
+@@ -725,9 +734,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/module/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/module/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/example/module/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/example/module/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/example/module/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kunittest/example/simple/Makefile.in kdesdk-3.5.5/kunittest/example/simple/Makefile.in
+--- kdesdk-3.5.5.old/kunittest/example/simple/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kunittest/example/simple/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -137,6 +137,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65613,20 +63133,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -185,6 +186,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -216,6 +223,9 @@
+@@ -222,6 +223,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65636,7 +63143,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -256,18 +266,16 @@
+@@ -262,18 +266,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65656,7 +63163,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -288,14 +296,18 @@
+@@ -294,14 +296,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65675,7 +63182,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -362,14 +374,17 @@
+@@ -368,14 +374,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65693,7 +63200,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -412,7 +427,7 @@
+@@ -418,7 +427,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65702,7 +63209,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -450,9 +465,9 @@
+@@ -427,9 +436,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/simple/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/simple/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kunittest/example/simple/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kunittest/example/simple/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -439,9 +448,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/simple/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/simple/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/example/simple/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/example/simple/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/example/simple/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -456,9 +465,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65714,8 +63245,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
---- kunittest/Makefile.in
-+++ kunittest/Makefile.in
+@@ -784,9 +793,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/example/simple/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/example/simple/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/example/simple/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/example/simple/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/example/simple/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/kunittest/Makefile.in kdesdk-3.5.5/kunittest/Makefile.in
+--- kdesdk-3.5.5.old/kunittest/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/kunittest/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -170,6 +170,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65724,20 +63268,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -218,6 +219,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -249,6 +256,9 @@
+@@ -255,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65747,7 +63278,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -289,18 +299,16 @@
+@@ -295,18 +299,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65767,7 +63298,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -321,14 +329,18 @@
+@@ -327,14 +329,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65786,7 +63317,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -395,14 +407,17 @@
+@@ -401,14 +407,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65804,7 +63335,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -448,7 +463,7 @@
+@@ -454,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65813,7 +63344,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +501,9 @@
+@@ -463,9 +472,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kunittest/Makefile
++#>- 	  $(AUTOMAKE) --gnu  kunittest/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -475,9 +484,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -492,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65825,19 +63380,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- Makefile.am
-+++ Makefile.am
-@@ -1,7 +1,7 @@
- ## kdesdk/Makefile.am
- ## (C) 1997 Stephan Kulow
+@@ -969,9 +978,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kunittest/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kunittest/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kunittest/Makefile
++	  $(AUTOMAKE) --gnu  kunittest/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit kunittest/Makefile.in
  
--AUTOMAKE_OPTIONS = foreign 1.5
-+AUTOMAKE_OPTIONS = foreign 1.6.1
- DISTCLEANFILES = inst-apps
  
- MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 SUBDIRS
---- Makefile.in
-+++ Makefile.in
+diff -ur kdesdk-3.5.5.old/Makefile.in kdesdk-3.5.5/Makefile.in
+--- kdesdk-3.5.5.old/Makefile.in	2006-10-02 20:29:19.000000000 +0200
++++ kdesdk-3.5.5/Makefile.in	2006-10-10 00:58:51.000000000 +0200
 @@ -127,6 +127,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65846,20 +63403,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -175,6 +176,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -206,6 +213,9 @@
+@@ -212,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65869,7 +63413,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -246,18 +256,16 @@
+@@ -252,18 +256,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65889,7 +63433,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -278,14 +286,18 @@
+@@ -284,14 +286,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -65908,7 +63452,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -352,14 +364,17 @@
+@@ -358,14 +364,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -65926,16 +63470,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -383,7 +398,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--AUTOMAKE_OPTIONS = foreign 1.5
-+AUTOMAKE_OPTIONS = foreign 1.6.1
- DISTCLEANFILES = inst-apps
- MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 SUBDIRS
- SUBDIRS = $(TOPSUBDIRS)
-@@ -395,7 +410,7 @@
+@@ -401,7 +410,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -65944,7 +63479,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,12 +452,12 @@
+@@ -443,12 +452,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -65959,7 +63494,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -454,7 +469,7 @@
+@@ -460,7 +469,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -65968,17 +63503,18 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -880,7 +895,7 @@
+@@ -886,7 +895,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=configure.in subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 kdesdk.lsm Makefile.am.in 
-+KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdesdk.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
+-KDE_DIST=configure.in COPYING-DOCS subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 kdesdk.lsm Makefile.am.in 
++KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdesdk.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure Makefile.am.in 
  
  #>+ 2
  docs-am:
---- poxml/antlr/antlr/Makefile.in
-+++ poxml/antlr/antlr/Makefile.in
+diff -ur kdesdk-3.5.5.old/poxml/antlr/antlr/Makefile.in kdesdk-3.5.5/poxml/antlr/antlr/Makefile.in
+--- kdesdk-3.5.5.old/poxml/antlr/antlr/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/poxml/antlr/antlr/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -99,6 +99,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -65987,20 +63523,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -147,6 +148,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -178,6 +185,9 @@
+@@ -184,6 +185,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66010,7 +63533,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -218,18 +228,16 @@
+@@ -224,18 +228,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66030,7 +63553,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -250,14 +258,18 @@
+@@ -256,14 +258,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66049,7 +63572,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -324,14 +336,17 @@
+@@ -330,14 +336,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66067,7 +63590,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -406,7 +421,7 @@
+@@ -412,7 +421,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66076,7 +63599,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -444,9 +459,9 @@
+@@ -421,9 +430,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/antlr/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/antlr/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  poxml/antlr/antlr/Makefile
++#>- 	  $(AUTOMAKE) --gnu  poxml/antlr/antlr/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -433,9 +442,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/antlr/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/antlr/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/antlr/antlr/Makefile
++	  $(AUTOMAKE) --gnu  poxml/antlr/antlr/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/antlr/antlr/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -450,9 +459,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66088,8 +63635,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- poxml/antlr/Makefile.in
-+++ poxml/antlr/Makefile.in
+@@ -650,9 +659,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/antlr/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/antlr/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/antlr/antlr/Makefile
++	  $(AUTOMAKE) --gnu  poxml/antlr/antlr/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/antlr/antlr/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/poxml/antlr/Makefile.in kdesdk-3.5.5/poxml/antlr/Makefile.in
+--- kdesdk-3.5.5.old/poxml/antlr/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/poxml/antlr/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -111,6 +111,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66098,20 +63658,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -159,6 +160,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -190,6 +197,9 @@
+@@ -196,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66121,7 +63668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -230,18 +240,16 @@
+@@ -236,18 +240,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66141,7 +63688,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -262,14 +270,18 @@
+@@ -268,14 +270,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66160,7 +63707,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -336,14 +348,17 @@
+@@ -342,14 +348,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66178,7 +63725,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -373,7 +388,7 @@
+@@ -379,7 +388,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -66187,7 +63734,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -411,9 +426,9 @@
+@@ -388,9 +397,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  poxml/antlr/Makefile
++#>- 	  $(AUTOMAKE) --gnu  poxml/antlr/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -400,9 +409,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/antlr/Makefile
++	  $(AUTOMAKE) --gnu  poxml/antlr/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/antlr/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -417,9 +426,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66199,8 +63770,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- poxml/antlr/src/Makefile.in
-+++ poxml/antlr/src/Makefile.in
+@@ -721,9 +730,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/antlr/Makefile
++	  $(AUTOMAKE) --gnu  poxml/antlr/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/antlr/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/poxml/antlr/src/Makefile.in kdesdk-3.5.5/poxml/antlr/src/Makefile.in
+--- kdesdk-3.5.5.old/poxml/antlr/src/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/poxml/antlr/src/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -147,6 +147,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66209,20 +63793,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -195,6 +196,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -226,6 +233,9 @@
+@@ -232,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66232,7 +63803,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -266,18 +276,16 @@
+@@ -272,18 +276,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66252,7 +63823,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -298,14 +306,18 @@
+@@ -304,14 +306,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66271,7 +63842,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -372,14 +384,17 @@
+@@ -378,14 +384,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66289,7 +63860,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -448,7 +463,7 @@
+@@ -454,7 +463,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -66298,7 +63869,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +501,9 @@
+@@ -463,9 +472,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/src/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/src/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  poxml/antlr/src/Makefile
++#>- 	  $(AUTOMAKE) --gnu  poxml/antlr/src/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -475,9 +484,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/src/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/src/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/antlr/src/Makefile
++	  $(AUTOMAKE) --gnu  poxml/antlr/src/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/antlr/src/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -492,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66310,8 +63905,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- poxml/Makefile.in
-+++ poxml/Makefile.in
+@@ -782,9 +791,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/antlr/src/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/antlr/src/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/antlr/src/Makefile
++	  $(AUTOMAKE) --gnu  poxml/antlr/src/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/antlr/src/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/poxml/Makefile.in kdesdk-3.5.5/poxml/Makefile.in
+--- kdesdk-3.5.5.old/poxml/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/poxml/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -186,6 +186,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66320,20 +63928,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -234,6 +235,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -265,6 +272,9 @@
+@@ -271,6 +272,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66343,7 +63938,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -305,18 +315,16 @@
+@@ -311,18 +315,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66363,7 +63958,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -337,14 +345,18 @@
+@@ -343,14 +345,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66382,7 +63977,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -411,14 +423,17 @@
+@@ -417,14 +423,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66400,7 +63995,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -467,7 +482,7 @@
+@@ -473,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .pot .po .xml .txml .cpp .lo .o .obj
@@ -66409,7 +64004,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +520,9 @@
+@@ -482,9 +491,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  poxml/Makefile
++#>- 	  $(AUTOMAKE) --gnu  poxml/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -494,9 +503,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/Makefile
++	  $(AUTOMAKE) --gnu  poxml/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -511,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66421,8 +64040,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- scheck/Makefile.in
-+++ scheck/Makefile.in
+@@ -921,9 +930,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  poxml/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  poxml/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  poxml/Makefile
++	  $(AUTOMAKE) --gnu  poxml/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit poxml/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/scheck/Makefile.in kdesdk-3.5.5/scheck/Makefile.in
+--- kdesdk-3.5.5.old/scheck/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/scheck/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -158,6 +158,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66431,20 +64063,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -206,6 +207,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -237,6 +244,9 @@
+@@ -243,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66454,7 +64073,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -277,18 +287,16 @@
+@@ -283,18 +287,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66474,7 +64093,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -309,14 +317,18 @@
+@@ -315,14 +317,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66493,7 +64112,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -383,14 +395,17 @@
+@@ -389,14 +395,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66511,7 +64130,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -431,7 +446,7 @@
+@@ -437,7 +446,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -66520,7 +64139,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -469,9 +484,9 @@
+@@ -446,9 +455,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  scheck/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scheck/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  scheck/Makefile
++#>- 	  $(AUTOMAKE) --gnu  scheck/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -458,9 +467,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  scheck/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scheck/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  scheck/Makefile
++	  $(AUTOMAKE) --gnu  scheck/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit scheck/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -475,9 +484,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66532,8 +64175,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- scripts/Makefile.in
-+++ scripts/Makefile.in
+@@ -789,9 +798,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  scheck/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scheck/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  scheck/Makefile
++	  $(AUTOMAKE) --gnu  scheck/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit scheck/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/scripts/Makefile.in kdesdk-3.5.5/scripts/Makefile.in
+--- kdesdk-3.5.5.old/scripts/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/scripts/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -111,6 +111,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66542,20 +64198,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -159,6 +160,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -190,6 +197,9 @@
+@@ -196,6 +197,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66565,7 +64208,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -230,18 +240,16 @@
+@@ -236,18 +240,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66585,7 +64228,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -262,14 +270,18 @@
+@@ -268,14 +270,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66604,7 +64247,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -336,14 +348,17 @@
+@@ -342,14 +348,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66622,7 +64265,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -408,12 +423,17 @@
+@@ -414,12 +423,17 @@
    kde-devel-emacs.el kde-devel-gdb kde-devel-vim.vim \
    kde.supp kdesvn-buildrc-sample
  
@@ -66641,7 +64284,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -451,9 +471,9 @@
+@@ -428,9 +442,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  scripts/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  scripts/Makefile
++#>- 	  $(AUTOMAKE) --gnu  scripts/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -440,9 +454,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  scripts/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  scripts/Makefile
++	  $(AUTOMAKE) --gnu  scripts/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit scripts/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -457,9 +471,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66653,7 +64320,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-@@ -678,30 +698,26 @@
+@@ -684,24 +698,20 @@
  	uninstall-kdesvn_build_syntaxDATA uninstall-man uninstall-man1
  
  
@@ -66685,15 +64352,21 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
+@@ -722,9 +732,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  scripts/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  scripts/Makefile
++	  $(AUTOMAKE) --gnu  scripts/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit scripts/Makefile.in
  
- #>+ 2
--KDE_DIST=svn2dist kde-spellcheck.pl makeobj create_makefiles cxxmetric pruneemptydirs create_svnignore kdelnk2desktop.py cvsforwardport cheatmake fixheaders kdemangen.pl cvs2dist create_cvsignore extend_dmalloc svngettags licensecheck adddebug rc2kcfgxt.pl fixuifiles cvsaddcurrentdir authors2xml.pl fixkdeincludes cvslastlog cvs-clean includemocs alldcop.rb cvslastchange zonetab2pot.py add_trace.pl svnlastchange cvsgettags create_makefile kdesvn-buildrc.xml svnchangesince svnlastlog findmissingcrystal kde-build cvscheck cvsbackport kDebug2kdDebug.sh extractrc build-progress.sh png2mng.pl svnrevertlast extractattr noncvslist cvsrevertlast cvsversion qtdoc cvsblame svnversions cvslastreferenced svnaddcurrentdir kdesvn-build check_licenses Makefile.in fixfsfaddr.sed svn-clean colorcvs kdedoc package_crystalsvg svnbackport colorsvn nonsvnlist kdekillall Makefile.am svnforwardport 
-+KDE_DIST=svn2dist kde-spellcheck.pl makeobj create_makefiles cxxmetric pruneemptydirs create_svnignore kdelnk2desktop.py cvsforwardport cheatmake fixheaders kdemangen.pl cvs2dist create_cvsignore extend_dmalloc svngettags licensecheck adddebug rc2kcfgxt.pl fixuifiles cvsaddcurrentdir authors2xml.pl fixkdeincludes cvslastlog includemocs alldcop.rb cvs-clean cvslastchange add_trace.pl zonetab2pot.py svnlastchange create_makefile cvsgettags kdesvn-buildrc.xml svnchangesince findmissingcrystal svnlastlog kde-build cvsbackport cvscheck kDebug2kdDebug.sh extractrc build-progress.sh png2mng.pl svnrevertlast extractattr noncvslist cvsrevertlast cvsversion qtdoc cvsblame svnversions cvslastreferenced svnaddcurrentdir kdesvn-build check_licenses svn-clean Makefile.in fixfsfaddr.sed colorcvs kdedoc package_crystalsvg svnbackport colorsvn nonsvnlist kdekillall Makefile.am svnforwardport 
  
- #>+ 2
- docs-am:
---- umbrello/Makefile.in
-+++ umbrello/Makefile.in
+diff -ur kdesdk-3.5.5.old/umbrello/Makefile.in kdesdk-3.5.5/umbrello/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/Makefile.in	2006-10-02 20:29:28.000000000 +0200
++++ kdesdk-3.5.5/umbrello/Makefile.in	2006-10-10 00:58:53.000000000 +0200
 @@ -113,6 +113,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66702,20 +64375,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -161,6 +162,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -192,6 +199,9 @@
+@@ -198,6 +199,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66725,7 +64385,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -232,18 +242,16 @@
+@@ -238,18 +242,16 @@
  VERSION := `cat ${PWD}/VERSION`
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66745,7 +64405,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -264,14 +272,18 @@
+@@ -270,14 +272,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66764,7 +64424,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -338,14 +350,17 @@
+@@ -344,14 +350,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66782,7 +64442,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -381,7 +396,7 @@
+@@ -387,7 +396,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -66791,7 +64451,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -419,9 +434,9 @@
+@@ -425,9 +434,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66803,8 +64463,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- umbrello/umbrello/autolayout/Makefile.in
-+++ umbrello/umbrello/autolayout/Makefile.in
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/autolayout/Makefile.in kdesdk-3.5.5/umbrello/umbrello/autolayout/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/autolayout/Makefile.in	2006-10-02 20:29:32.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/autolayout/Makefile.in	2006-10-10 00:58:54.000000000 +0200
 @@ -133,6 +133,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66813,20 +64474,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -181,6 +182,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -212,6 +219,9 @@
+@@ -218,6 +219,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66836,7 +64484,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -252,18 +262,16 @@
+@@ -258,18 +262,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66856,7 +64504,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -284,14 +292,18 @@
+@@ -290,14 +292,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66875,7 +64523,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -358,14 +370,17 @@
+@@ -364,14 +370,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -66893,7 +64541,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -415,7 +430,7 @@
+@@ -421,7 +430,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -66902,7 +64550,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -453,9 +468,9 @@
+@@ -430,9 +439,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/autolayout/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/autolayout/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/autolayout/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/autolayout/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -442,9 +451,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/autolayout/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/autolayout/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/autolayout/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/autolayout/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/autolayout/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -459,9 +468,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66914,8 +64586,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- umbrello/umbrello/clipboard/Makefile.in
-+++ umbrello/umbrello/clipboard/Makefile.in
+@@ -733,9 +742,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/autolayout/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/autolayout/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/autolayout/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/autolayout/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/autolayout/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/clipboard/Makefile.in kdesdk-3.5.5/umbrello/umbrello/clipboard/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/clipboard/Makefile.in	2006-10-02 20:29:32.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/clipboard/Makefile.in	2006-10-10 00:58:54.000000000 +0200
 @@ -127,6 +127,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -66924,20 +64609,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -175,6 +176,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -206,6 +213,9 @@
+@@ -212,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66947,7 +64619,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -246,18 +256,16 @@
+@@ -252,18 +256,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66967,7 +64639,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -278,14 +286,18 @@
+@@ -284,14 +286,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -66986,7 +64658,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -352,14 +364,17 @@
+@@ -358,14 +364,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -67004,7 +64676,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -393,7 +408,7 @@
+@@ -399,7 +408,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67013,7 +64685,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -431,9 +446,9 @@
+@@ -408,9 +417,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/clipboard/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/clipboard/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/clipboard/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/clipboard/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -420,9 +429,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/clipboard/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/clipboard/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/clipboard/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/clipboard/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/clipboard/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -437,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67025,8 +64721,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- umbrello/umbrello/codegenerators/Makefile.in
-+++ umbrello/umbrello/codegenerators/Makefile.in
+@@ -696,9 +705,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/clipboard/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/clipboard/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/clipboard/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/clipboard/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/clipboard/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/codegenerators/Makefile.in kdesdk-3.5.5/umbrello/umbrello/codegenerators/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/codegenerators/Makefile.in	2006-10-02 20:29:33.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/codegenerators/Makefile.in	2006-10-10 00:58:55.000000000 +0200
 @@ -180,6 +180,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -67035,20 +64744,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -228,6 +229,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -259,6 +266,9 @@
+@@ -265,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67058,7 +64754,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -299,18 +309,16 @@
+@@ -305,18 +309,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67078,7 +64774,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -331,14 +339,18 @@
+@@ -337,14 +339,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -67097,7 +64793,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -405,14 +417,17 @@
+@@ -411,14 +417,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -67115,7 +64811,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -506,7 +521,7 @@
+@@ -512,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67124,7 +64820,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -544,9 +559,9 @@
+@@ -521,9 +530,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codegenerators/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codegenerators/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/codegenerators/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/codegenerators/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -533,9 +542,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codegenerators/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codegenerators/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/codegenerators/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/codegenerators/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/codegenerators/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -550,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67136,202 +64856,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -891,18 +906,18 @@
- mocs: javacodeclassfield.moc
+@@ -1238,9 +1247,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codegenerators/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codegenerators/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/codegenerators/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/codegenerators/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/codegenerators/Makefile.in
  
- #>+ 3
--xmlschemawriter.moc: $(srcdir)/xmlschemawriter.h
--	$(MOC) $(srcdir)/xmlschemawriter.h -o xmlschemawriter.moc
-+rubycodegenerationpolicypage.moc: $(srcdir)/rubycodegenerationpolicypage.h
-+	$(MOC) $(srcdir)/rubycodegenerationpolicypage.h -o rubycodegenerationpolicypage.moc
  
- #>+ 2
--mocs: xmlschemawriter.moc
-+mocs: rubycodegenerationpolicypage.moc
- 
- #>+ 3
--rubycodegenerationpolicypage.moc: $(srcdir)/rubycodegenerationpolicypage.h
--	$(MOC) $(srcdir)/rubycodegenerationpolicypage.h -o rubycodegenerationpolicypage.moc
-+xmlschemawriter.moc: $(srcdir)/xmlschemawriter.h
-+	$(MOC) $(srcdir)/xmlschemawriter.h -o xmlschemawriter.moc
- 
- #>+ 2
--mocs: rubycodegenerationpolicypage.moc
-+mocs: xmlschemawriter.moc
- 
- #>+ 3
- cppcodegenerationpolicypage.moc: $(srcdir)/cppcodegenerationpolicypage.h
-@@ -933,18 +948,18 @@
- mocs: javaclassdeclarationblock.moc
- 
- #>+ 3
--cppcodegenerator.moc: $(srcdir)/cppcodegenerator.h
--	$(MOC) $(srcdir)/cppcodegenerator.h -o cppcodegenerator.moc
-+aswriter.moc: $(srcdir)/aswriter.h
-+	$(MOC) $(srcdir)/aswriter.h -o aswriter.moc
- 
- #>+ 2
--mocs: cppcodegenerator.moc
-+mocs: aswriter.moc
- 
- #>+ 3
--aswriter.moc: $(srcdir)/aswriter.h
--	$(MOC) $(srcdir)/aswriter.h -o aswriter.moc
-+cppcodegenerator.moc: $(srcdir)/cppcodegenerator.h
-+	$(MOC) $(srcdir)/cppcodegenerator.h -o cppcodegenerator.moc
- 
- #>+ 2
--mocs: aswriter.moc
-+mocs: cppcodegenerator.moc
- 
- #>+ 3
- xmlcodecomment.moc: $(srcdir)/xmlcodecomment.h
-@@ -954,6 +969,13 @@
- mocs: xmlcodecomment.moc
- 
- #>+ 3
-+cppsourcecodedocument.moc: $(srcdir)/cppsourcecodedocument.h
-+	$(MOC) $(srcdir)/cppsourcecodedocument.h -o cppsourcecodedocument.moc
-+
-+#>+ 2
-+mocs: cppsourcecodedocument.moc
-+
-+#>+ 3
- javacodegenerationpolicy.moc: $(srcdir)/javacodegenerationpolicy.h
- 	$(MOC) $(srcdir)/javacodegenerationpolicy.h -o javacodegenerationpolicy.moc
- 
-@@ -968,13 +990,6 @@
- mocs: rubyclassifiercodedocument.moc
- 
- #>+ 3
--cppsourcecodedocument.moc: $(srcdir)/cppsourcecodedocument.h
--	$(MOC) $(srcdir)/cppsourcecodedocument.h -o cppsourcecodedocument.moc
--
--#>+ 2
--mocs: cppsourcecodedocument.moc
--
--#>+ 3
- rubycodeclassfield.moc: $(srcdir)/rubycodeclassfield.h
- 	$(MOC) $(srcdir)/rubycodeclassfield.h -o rubycodeclassfield.moc
- 
-@@ -982,18 +997,18 @@
- mocs: rubycodeclassfield.moc
- 
- #>+ 3
--cppcodegenerationpolicy.moc: $(srcdir)/cppcodegenerationpolicy.h
--	$(MOC) $(srcdir)/cppcodegenerationpolicy.h -o cppcodegenerationpolicy.moc
-+simplecodegenerator.moc: $(srcdir)/simplecodegenerator.h
-+	$(MOC) $(srcdir)/simplecodegenerator.h -o simplecodegenerator.moc
- 
- #>+ 2
--mocs: cppcodegenerationpolicy.moc
-+mocs: simplecodegenerator.moc
- 
- #>+ 3
--simplecodegenerator.moc: $(srcdir)/simplecodegenerator.h
--	$(MOC) $(srcdir)/simplecodegenerator.h -o simplecodegenerator.moc
-+cppcodegenerationpolicy.moc: $(srcdir)/cppcodegenerationpolicy.h
-+	$(MOC) $(srcdir)/cppcodegenerationpolicy.h -o cppcodegenerationpolicy.moc
- 
- #>+ 2
--mocs: simplecodegenerator.moc
-+mocs: cppcodegenerationpolicy.moc
- 
- #>+ 3
- sqlwriter.moc: $(srcdir)/sqlwriter.h
-@@ -1017,18 +1032,18 @@
- mocs: cppheadercodeaccessormethod.moc
- 
- #>+ 3
--rubycodecomment.moc: $(srcdir)/rubycodecomment.h
--	$(MOC) $(srcdir)/rubycodecomment.h -o rubycodecomment.moc
-+jswriter.moc: $(srcdir)/jswriter.h
-+	$(MOC) $(srcdir)/jswriter.h -o jswriter.moc
- 
- #>+ 2
--mocs: rubycodecomment.moc
-+mocs: jswriter.moc
- 
- #>+ 3
--jswriter.moc: $(srcdir)/jswriter.h
--	$(MOC) $(srcdir)/jswriter.h -o jswriter.moc
-+rubycodecomment.moc: $(srcdir)/rubycodecomment.h
-+	$(MOC) $(srcdir)/rubycodecomment.h -o rubycodecomment.moc
- 
- #>+ 2
--mocs: jswriter.moc
-+mocs: rubycodecomment.moc
- 
- #>+ 3
- javacodegenerator.moc: $(srcdir)/javacodegenerator.h
-@@ -1038,18 +1053,18 @@
- mocs: javacodegenerator.moc
- 
- #>+ 3
--javacodegenerationpolicypage.moc: $(srcdir)/javacodegenerationpolicypage.h
--	$(MOC) $(srcdir)/javacodegenerationpolicypage.h -o javacodegenerationpolicypage.moc
-+rubywriter.moc: $(srcdir)/rubywriter.h
-+	$(MOC) $(srcdir)/rubywriter.h -o rubywriter.moc
- 
- #>+ 2
--mocs: javacodegenerationpolicypage.moc
-+mocs: rubywriter.moc
- 
- #>+ 3
--rubywriter.moc: $(srcdir)/rubywriter.h
--	$(MOC) $(srcdir)/rubywriter.h -o rubywriter.moc
-+javacodegenerationpolicypage.moc: $(srcdir)/javacodegenerationpolicypage.h
-+	$(MOC) $(srcdir)/javacodegenerationpolicypage.h -o javacodegenerationpolicypage.moc
- 
- #>+ 2
--mocs: rubywriter.moc
-+mocs: javacodegenerationpolicypage.moc
- 
- #>+ 3
- cppcodecomment.moc: $(srcdir)/cppcodecomment.h
-@@ -1066,6 +1081,13 @@
- mocs: cppmakecodedocument.moc
- 
- #>+ 3
-+javacodeoperation.moc: $(srcdir)/javacodeoperation.h
-+	$(MOC) $(srcdir)/javacodeoperation.h -o javacodeoperation.moc
-+
-+#>+ 2
-+mocs: javacodeoperation.moc
-+
-+#>+ 3
- pythonwriter.moc: $(srcdir)/pythonwriter.h
- 	$(MOC) $(srcdir)/pythonwriter.h -o pythonwriter.moc
- 
-@@ -1080,13 +1102,6 @@
- mocs: javacodedocumentation.moc
- 
- #>+ 3
--javacodeoperation.moc: $(srcdir)/javacodeoperation.h
--	$(MOC) $(srcdir)/javacodeoperation.h -o javacodeoperation.moc
--
--#>+ 2
--mocs: javacodeoperation.moc
--
--#>+ 3
- cppcodeclassfield.moc: $(srcdir)/cppcodeclassfield.h
- 	$(MOC) $(srcdir)/cppcodeclassfield.h -o cppcodeclassfield.moc
- 
-@@ -1207,10 +1222,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  cppheaderclassdeclarationblock.moc javacodeclassfielddeclarationblock.moc rubycodedocumentation.moc javaantcodedocument.moc rubycodegenerator.moc javacodeaccessormethod.moc php5writer.moc javacodeclassfield.moc xmlschemawriter.moc rubycodegenerationpolicypage.moc cppcodegenerationpolicypage.moc rubycodegenerationpolicy.moc javacodecomment.moc javaclassdeclarationblock.moc cppcodegenerator.moc aswriter.moc xmlcodecomment.moc javacodegenerationpolicy.moc rubyclassifiercodedocument.moc cppsourcecodedocument.moc rubycodeclassfield.moc cppcodegenerationpolicy.moc simplecodegenerator.moc sqlwriter.moc xmlelementcodeblock.moc cppheadercodeaccessormethod.moc rubycodecomment.moc jswriter.moc javacodegenerator.moc javacodegenerationpolicypage.moc rubywriter.moc cppcodecomment.moc cppmakecodedocument.moc pythonwriter.moc javacodedocumentation.moc javacodeoperation.moc cppcodeclassfield.moc rubycodeoperation.moc cppsourcecodeaccessormethod.moc rubycodeaccessormethod.moc pascalwriter.moc rubycodeclassfielddeclarationblock.moc cppheadercodeclassfielddeclarationblock.moc cppsourcecodeclassfielddeclarationblock.moc adawriter.moc cppheadercodeoperation.moc cppsourcecodeoperation.moc cppcodegenerationform.moc javaclassifiercodedocument.moc rubyclassdeclarationblock.moc perlwriter.moc cppheadercodedocument.moc phpwriter.moc
-+	-rm -f  cppheaderclassdeclarationblock.moc javacodeclassfielddeclarationblock.moc rubycodedocumentation.moc javaantcodedocument.moc rubycodegenerator.moc javacodeaccessormethod.moc php5writer.moc javacodeclassfield.moc rubycodegenerationpolicypage.moc xmlschemawriter.moc cppcodegenerationpolicypage.moc rubycodegenerationpolicy.moc javacodecomment.moc javaclassdeclarationblock.moc aswriter.moc cppcodegenerator.moc xmlcodecomment.moc cppsourcecodedocument.moc javacodegenerationpolicy.moc rubyclassifiercodedocument.moc rubycodeclassfield.moc simplecodegenerator.moc cppcodegenerationpolicy.moc sqlwriter.moc xmlelementcodeblock.moc cppheadercodeaccessormethod.moc jswriter.moc rubycodecomment.moc javacodegenerator.moc rubywriter.moc javacodegenerationpolicypage.moc cppcodecomment.moc cppmakecodedocument.moc javacodeoperation.moc pythonwriter.moc javacodedocumentation.moc cppcodeclassfield.moc rubycodeoperation.moc cppsourcecodeaccessormethod.moc rubycodeaccessormethod.moc pascalwriter.moc rubycodeclassfielddeclarationblock.moc cppheadercodeclassfielddeclarationblock.moc cppsourcecodeclassfielddeclarationblock.moc adawriter.moc cppheadercodeoperation.moc cppsourcecodeoperation.moc cppcodegenerationform.moc javaclassifiercodedocument.moc rubyclassdeclarationblock.moc perlwriter.moc cppheadercodedocument.moc phpwriter.moc
- 
- #>+ 2
--KDE_DIST=rubycodeclassfielddeclarationblock.h adawriter.h javacodegenerationformbase.ui tclwriter.h xmlcodecomment.h aswriter.h javaclassifiercodedocument.h cppcodegenerationformbase.ui cppsourcecodeaccessormethod.h Makefile.in rubycodegenerationformbase.ui codegenpolicyext.h rubycodegenerationpolicy.h pascalwriter.h javacodeclassfield.h javacodeaccessormethod.h javawriter.h rubycodedocumentation.h codegen_utils.h xmlelementcodeblock.h rubywriter.h classifierinfo.h rubycodeclassfield.h cppheadercodedocument.h jswriter.h javacodedocumentation.h javacodeclassfielddeclarationblock.h cppcodeclassfield.h cppsourcecodeclassfielddeclarationblock.h javaclassdeclarationblock.h codegenfactory.h rubycodecomment.h rubycodeaccessormethod.h perlwriter.h cppcodegenerationform.h cppcodegenerator.h simplecodegenerator.h cppwriter.h cppmakecodedocument.h cppsourcecodeoperation.h rubyclassifiercodedocument.h cppheadercodeoperation.h xmlschemawriter.h cppheaderclassdeclarationblock.h cppheadercodeclassfielddeclarationblock.h javacodegenerationpolicypage.h cppcodegenerationpolicypage.h javaantcodedocument.h phpwriter.h javacodegenerator.h cppcodecomment.h javacodecomment.h sqlwriter.h cppsourcecodedocument.h cppheadercodeaccessormethod.h javacodegenerationpolicy.h idlwriter.h cppcodegenerationpolicy.h pythonwriter.h cppcodedocumentation.h rubycodegenerator.h rubyclassdeclarationblock.h rubycodegenerationpolicypage.h php5writer.h rubycodeoperation.h Makefile.am javacodeoperation.h 
-+KDE_DIST=rubycodeclassfielddeclarationblock.h adawriter.h javacodegenerationformbase.ui tclwriter.h xmlcodecomment.h aswriter.h javaclassifiercodedocument.h cppcodegenerationformbase.ui cppsourcecodeaccessormethod.h Makefile.in rubycodegenerationformbase.ui codegenpolicyext.h rubycodegenerationpolicy.h pascalwriter.h javacodeclassfield.h javacodeaccessormethod.h javawriter.h rubycodedocumentation.h codegen_utils.h xmlelementcodeblock.h rubywriter.h classifierinfo.h rubycodeclassfield.h cppheadercodedocument.h jswriter.h javacodedocumentation.h javacodeclassfielddeclarationblock.h cppsourcecodeclassfielddeclarationblock.h cppcodeclassfield.h javaclassdeclarationblock.h codegenfactory.h rubycodecomment.h rubycodeaccessormethod.h perlwriter.h cppcodegenerationform.h cppcodegenerator.h simplecodegenerator.h cppwriter.h cppmakecodedocument.h cppsourcecodeoperation.h rubyclassifiercodedocument.h cppheadercodeoperation.h xmlschemawriter.h cppheadercodeclassfielddeclarationblock.h cppheaderclassdeclarationblock.h javacodegenerationpolicypage.h cppcodegenerationpolicypage.h javaantcodedocument.h phpwriter.h javacodegenerator.h javacodecomment.h cppcodecomment.h sqlwriter.h cppsourcecodedocument.h cppheadercodeaccessormethod.h javacodegenerationpolicy.h idlwriter.h cppcodegenerationpolicy.h pythonwriter.h cppcodedocumentation.h rubyclassdeclarationblock.h rubycodegenerator.h rubycodegenerationpolicypage.h php5writer.h rubycodeoperation.h Makefile.am javacodeoperation.h 
- 
- #>+ 6
- clean-ui:
---- umbrello/umbrello/codeimport/kdevcppparser/Makefile.in
-+++ umbrello/umbrello/codeimport/kdevcppparser/Makefile.in
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/codeimport/kdevcppparser/Makefile.in kdesdk-3.5.5/umbrello/umbrello/codeimport/kdevcppparser/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/codeimport/kdevcppparser/Makefile.in	2006-10-02 20:29:33.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/codeimport/kdevcppparser/Makefile.in	2006-10-10 00:58:55.000000000 +0200
 @@ -131,6 +131,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -67340,20 +64879,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -179,6 +180,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -210,6 +217,9 @@
+@@ -216,6 +217,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67363,7 +64889,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -250,18 +260,16 @@
+@@ -256,18 +260,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67383,7 +64909,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -282,14 +290,18 @@
+@@ -288,14 +290,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -67402,7 +64928,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -356,14 +368,17 @@
+@@ -362,14 +368,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -67420,7 +64946,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -396,7 +411,7 @@
+@@ -402,7 +411,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67429,7 +64955,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +449,9 @@
+@@ -411,9 +420,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/kdevcppparser/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/kdevcppparser/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/kdevcppparser/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/kdevcppparser/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -423,9 +432,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/kdevcppparser/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/kdevcppparser/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/kdevcppparser/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/kdevcppparser/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/codeimport/kdevcppparser/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -440,9 +449,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67441,8 +64991,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- umbrello/umbrello/codeimport/Makefile.in
-+++ umbrello/umbrello/codeimport/Makefile.in
+@@ -695,9 +704,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/kdevcppparser/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/kdevcppparser/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/kdevcppparser/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/kdevcppparser/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/codeimport/kdevcppparser/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/codeimport/Makefile.in kdesdk-3.5.5/umbrello/umbrello/codeimport/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/codeimport/Makefile.in	2006-10-02 20:29:33.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/codeimport/Makefile.in	2006-10-10 00:58:55.000000000 +0200
 @@ -145,6 +145,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -67451,20 +65014,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -193,6 +194,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -224,6 +231,9 @@
+@@ -230,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67474,7 +65024,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -264,18 +274,16 @@
+@@ -270,18 +274,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67494,7 +65044,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -296,14 +304,18 @@
+@@ -302,14 +304,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -67513,7 +65063,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -370,14 +382,17 @@
+@@ -376,14 +382,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -67531,7 +65081,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -411,7 +426,7 @@
+@@ -417,7 +426,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67540,7 +65090,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -449,9 +464,9 @@
+@@ -426,9 +435,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -438,9 +447,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/codeimport/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -455,9 +464,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67552,8 +65126,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- umbrello/umbrello/dialogs/Makefile.in
-+++ umbrello/umbrello/dialogs/Makefile.in
+@@ -813,9 +822,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/codeimport/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/codeimport/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/codeimport/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/dialogs/Makefile.in kdesdk-3.5.5/umbrello/umbrello/dialogs/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/dialogs/Makefile.in	2006-10-02 20:29:34.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/dialogs/Makefile.in	2006-10-10 00:58:55.000000000 +0200
 @@ -151,6 +151,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -67562,20 +65149,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -199,6 +200,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -230,6 +237,9 @@
+@@ -236,6 +237,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67585,7 +65159,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -270,18 +280,16 @@
+@@ -276,18 +280,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67605,7 +65179,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -302,14 +310,18 @@
+@@ -308,14 +310,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -67624,7 +65198,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -376,14 +388,17 @@
+@@ -382,14 +388,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -67642,7 +65216,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -507,7 +522,7 @@
+@@ -513,7 +522,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67651,7 +65225,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -545,9 +560,9 @@
+@@ -522,9 +531,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/dialogs/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/dialogs/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/dialogs/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/dialogs/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -534,9 +543,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/dialogs/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/dialogs/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/dialogs/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/dialogs/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/dialogs/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -551,9 +560,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67663,1074 +65261,156 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -845,18 +860,18 @@
- mocs: pkgcontentspage.moc
+@@ -1064,9 +1073,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/dialogs/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/dialogs/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/dialogs/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/dialogs/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/dialogs/Makefile.in
  
- #>+ 3
--selectopdlg.moc: $(srcdir)/selectopdlg.h
--	$(MOC) $(srcdir)/selectopdlg.h -o selectopdlg.moc
-+activitypage.moc: $(srcdir)/activitypage.h
-+	$(MOC) $(srcdir)/activitypage.h -o activitypage.moc
  
- #>+ 2
--mocs: selectopdlg.moc
-+mocs: activitypage.moc
- 
- #>+ 3
--activitypage.moc: $(srcdir)/activitypage.h
--	$(MOC) $(srcdir)/activitypage.h -o activitypage.moc
-+selectopdlg.moc: $(srcdir)/selectopdlg.h
-+	$(MOC) $(srcdir)/selectopdlg.h -o selectopdlg.moc
- 
- #>+ 2
--mocs: activitypage.moc
-+mocs: selectopdlg.moc
- 
- #>+ 3
- assocpropdlg.moc: $(srcdir)/assocpropdlg.h
-@@ -873,18 +888,18 @@
- mocs: activitydialog.moc
- 
- #>+ 3
--exportallviewsdialog.moc: $(srcdir)/exportallviewsdialog.h
--	$(MOC) $(srcdir)/exportallviewsdialog.h -o exportallviewsdialog.moc
-+umlviewdialog.moc: $(srcdir)/umlviewdialog.h
-+	$(MOC) $(srcdir)/umlviewdialog.h -o umlviewdialog.moc
- 
- #>+ 2
--mocs: exportallviewsdialog.moc
-+mocs: umlviewdialog.moc
- 
- #>+ 3
--umlviewdialog.moc: $(srcdir)/umlviewdialog.h
--	$(MOC) $(srcdir)/umlviewdialog.h -o umlviewdialog.moc
-+exportallviewsdialog.moc: $(srcdir)/exportallviewsdialog.h
-+	$(MOC) $(srcdir)/exportallviewsdialog.h -o exportallviewsdialog.moc
- 
- #>+ 2
--mocs: umlviewdialog.moc
-+mocs: exportallviewsdialog.moc
- 
- #>+ 3
- umloperationdialog.moc: $(srcdir)/umloperationdialog.h
-@@ -922,13 +937,6 @@
- mocs: classpropdlg.moc
- 
- #>+ 3
--assocpage.moc: $(srcdir)/assocpage.h
--	$(MOC) $(srcdir)/assocpage.h -o assocpage.moc
--
--#>+ 2
--mocs: assocpage.moc
--
--#>+ 3
- classgenpage.moc: $(srcdir)/classgenpage.h
- 	$(MOC) $(srcdir)/classgenpage.h -o classgenpage.moc
- 
-@@ -936,11 +944,11 @@
- mocs: classgenpage.moc
- 
- #>+ 3
--codegenerationpolicypage.moc: $(srcdir)/codegenerationpolicypage.h
--	$(MOC) $(srcdir)/codegenerationpolicypage.h -o codegenerationpolicypage.moc
-+assocpage.moc: $(srcdir)/assocpage.h
-+	$(MOC) $(srcdir)/assocpage.h -o assocpage.moc
- 
- #>+ 2
--mocs: codegenerationpolicypage.moc
-+mocs: assocpage.moc
- 
- #>+ 3
- defaultcodegenpolicypage.moc: $(srcdir)/defaultcodegenpolicypage.h
-@@ -950,6 +958,13 @@
- mocs: defaultcodegenpolicypage.moc
- 
- #>+ 3
-+codegenerationpolicypage.moc: $(srcdir)/codegenerationpolicypage.h
-+	$(MOC) $(srcdir)/codegenerationpolicypage.h -o codegenerationpolicypage.moc
-+
-+#>+ 2
-+mocs: codegenerationpolicypage.moc
-+
-+#>+ 3
- assocrolepage.moc: $(srcdir)/assocrolepage.h
- 	$(MOC) $(srcdir)/assocrolepage.h -o assocrolepage.moc
- 
-@@ -971,6 +986,13 @@
- mocs: classifierlistpage.moc
- 
- #>+ 3
-+diagramprintpage.moc: $(srcdir)/diagramprintpage.h
-+	$(MOC) $(srcdir)/diagramprintpage.h -o diagramprintpage.moc
-+
-+#>+ 2
-+mocs: diagramprintpage.moc
-+
-+#>+ 3
- settingsdlg.moc: $(srcdir)/settingsdlg.h
- 	$(MOC) $(srcdir)/settingsdlg.h -o settingsdlg.moc
- 
-@@ -985,11 +1007,11 @@
- mocs: codeeditor.moc
- 
- #>+ 3
--diagramprintpage.moc: $(srcdir)/diagramprintpage.h
--	$(MOC) $(srcdir)/diagramprintpage.h -o diagramprintpage.moc
-+umlentityattributedialog.moc: $(srcdir)/umlentityattributedialog.h
-+	$(MOC) $(srcdir)/umlentityattributedialog.h -o umlentityattributedialog.moc
- 
- #>+ 2
--mocs: diagramprintpage.moc
-+mocs: umlentityattributedialog.moc
- 
- #>+ 3
- codevieweroptionspage.moc: $(srcdir)/codevieweroptionspage.h
-@@ -1006,13 +1028,6 @@
- mocs: statedialog.moc
- 
- #>+ 3
--umlentityattributedialog.moc: $(srcdir)/umlentityattributedialog.h
--	$(MOC) $(srcdir)/umlentityattributedialog.h -o umlentityattributedialog.moc
--
--#>+ 2
--mocs: umlentityattributedialog.moc
--
--#>+ 3
- overwritedialogue.moc: $(srcdir)/overwritedialogue.h
- 	$(MOC) $(srcdir)/overwritedialogue.h -o overwritedialogue.moc
- 
-@@ -1028,7 +1043,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  umltemplatedialog.moc umlattributedialog.moc umlroleproperties.moc codeviewerdialog.moc pkgcontentspage.moc selectopdlg.moc activitypage.moc assocpropdlg.moc activitydialog.moc exportallviewsdialog.moc umlviewdialog.moc umloperationdialog.moc umlwidgetcolorpage.moc codegenerationoptionspage.moc codegenerationwizard.moc classpropdlg.moc assocpage.moc classgenpage.moc codegenerationpolicypage.moc defaultcodegenpolicypage.moc assocrolepage.moc umlroledialog.moc classifierlistpage.moc settingsdlg.moc codeeditor.moc diagramprintpage.moc codevieweroptionspage.moc statedialog.moc umlentityattributedialog.moc overwritedialogue.moc assocgenpage.moc
-+	-rm -f  umltemplatedialog.moc umlattributedialog.moc umlroleproperties.moc codeviewerdialog.moc pkgcontentspage.moc activitypage.moc selectopdlg.moc assocpropdlg.moc activitydialog.moc umlviewdialog.moc exportallviewsdialog.moc umloperationdialog.moc umlwidgetcolorpage.moc codegenerationoptionspage.moc codegenerationwizard.moc classpropdlg.moc classgenpage.moc assocpage.moc defaultcodegenpolicypage.moc codegenerationpolicypage.moc assocrolepage.moc umlroledialog.moc classifierlistpage.moc diagramprintpage.moc settingsdlg.moc codeeditor.moc umlentityattributedialog.moc codevieweroptionspage.moc statedialog.moc overwritedialogue.moc assocgenpage.moc
- 
- #>+ 2
- KDE_DIST=activitydialog.h codegenerationoptionspage.h classpropdlg.h assocrolepage.h classifierlistpage.h activitypage.h umltemplatedialog.h overwritedialogue.h umlviewdialog.h settingsdlg.h Makefile.in codegenerationpolicypage.h pkgcontentspage.h dialogpage.h notedialog.h codevieweroptionspage.h defaultcodegenpolicypage.h parmpropdlg.h selectopdlg.h codegenerationoptionsbase.ui assocpage.h umlroleproperties.h umlentityattributedialog.h umloperationdialog.h diagrampropertiespage.ui umlrolepropertiesbase.ui assocpropdlg.h umlwidgetcolorpage.h exportallviewsdialogbase.ui assocgenpage.h codegenerationpolicybase.ui codegenerationwizardbase.ui exportallviewsdialog.h umlroledialog.h statedialog.h codeeditor.h diagramprintpage.h codeviewerdialog.h classwizard.h codevieweroptionsbase.ui codeviewerdialogbase.ui classgenpage.h umlattributedialog.h classoptionspage.h codegenerationwizard.h Makefile.am 
-@@ -1087,7 +1102,7 @@
- 
- 
- #>+ 11
--libdialogs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitydialog.cpp $(srcdir)/activitypage.cpp $(srcdir)/assocgenpage.cpp $(srcdir)/assocpage.cpp $(srcdir)/assocpropdlg.cpp $(srcdir)/assocrolepage.cpp $(srcdir)/classgenpage.cpp $(srcdir)/classifierlistpage.cpp $(srcdir)/classoptionspage.cpp $(srcdir)/classpropdlg.cpp $(srcdir)/classwizard.cpp $(srcdir)/codeeditor.cpp $(srcdir)/codegenerationoptionspage.cpp $(srcdir)/codegenerationpolicypage.cpp $(srcdir)/codegenerationwizard.cpp $(srcdir)/codeviewerdialog.cpp $(srcdir)/codevieweroptionspage.cpp $(srcdir)/defaultcodegenpolicypage.cpp $(srcdir)/diagramprintpage.cpp $(srcdir)/exportallviewsdialog.cpp $(srcdir)/notedialog.cpp $(srcdir)/overwritedialogue.cpp $(srcdir)/pkgcontentspage.cpp $(srcdir)/parmpropdlg.cpp $(srcdir)/selectopdlg.cpp $(srcdir)/settingsdlg.cpp $(srcdir)/statedialog.cpp $(srcdir)/umlattributedialog.cpp $(srcdir)/umlentityattributedialog.cpp $(srcdir)/umloperationdialog.cpp $(srcdir)/umltemplatedialog.cpp $(srcdir)/umlroledialog.cpp $(srcdir)/umlroleproperties.cpp $(srcdir)/umlviewdialog.cpp $(srcdir)/umlwidgetcolorpage.cpp codegenerationoptionsbase.cpp codegenerationpolicybase.cpp codegenerationwizardbase.cpp codeviewerdialogbase.cpp codevieweroptionsbase.cpp diagrampropertiespage.cpp exportallviewsdialogbase.cpp umlrolepropertiesbase.cpp  umltemplatedialog.moc umlroleproperties.moc umlrolepropertiesbase.moc pkgcontentspage.moc exportallviewsdialogbase.moc activitypage.moc codevieweroptionsbase.moc activitydialog.moc umlviewdialog.moc exportallviewsdialog.moc codegenerationpolicybase.moc diagrampropertiespage.moc codegenerationoptionspage.moc classpropdlg.moc codegenerationwizard.moc classgenpage.moc assocpage.moc codegenerationpolicypage.moc assocrolepage.moc codegenerationwizardbase.moc umlroledialog.moc classifierlistpage.moc codeeditor.moc statedialog.moc overwritedialogue.moc codegenerationoptionsbase.moc assocgenpage.moc umlattributedialog.moc codeviewerdialog.moc selectopdlg.moc assocpropdlg.moc codeviewerdialogbase.moc umloperationdialog.moc umlwidgetcolorpage.moc defaultcodegenpolicypage.moc diagramprintpage.moc settingsdlg.moc umlentityattributedialog.moc codevieweroptionspage.moc
-+libdialogs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitydialog.cpp $(srcdir)/activitypage.cpp $(srcdir)/assocgenpage.cpp $(srcdir)/assocpage.cpp $(srcdir)/assocpropdlg.cpp $(srcdir)/assocrolepage.cpp $(srcdir)/classgenpage.cpp $(srcdir)/classifierlistpage.cpp $(srcdir)/classoptionspage.cpp $(srcdir)/classpropdlg.cpp $(srcdir)/classwizard.cpp $(srcdir)/codeeditor.cpp $(srcdir)/codegenerationoptionspage.cpp $(srcdir)/codegenerationpolicypage.cpp $(srcdir)/codegenerationwizard.cpp $(srcdir)/codeviewerdialog.cpp $(srcdir)/codevieweroptionspage.cpp $(srcdir)/defaultcodegenpolicypage.cpp $(srcdir)/diagramprintpage.cpp $(srcdir)/exportallviewsdialog.cpp $(srcdir)/notedialog.cpp $(srcdir)/overwritedialogue.cpp $(srcdir)/pkgcontentspage.cpp $(srcdir)/parmpropdlg.cpp $(srcdir)/selectopdlg.cpp $(srcdir)/settingsdlg.cpp $(srcdir)/statedialog.cpp $(srcdir)/umlattributedialog.cpp $(srcdir)/umlentityattributedialog.cpp $(srcdir)/umloperationdialog.cpp $(srcdir)/umltemplatedialog.cpp $(srcdir)/umlroledialog.cpp $(srcdir)/umlroleproperties.cpp $(srcdir)/umlviewdialog.cpp $(srcdir)/umlwidgetcolorpage.cpp codegenerationoptionsbase.cpp codegenerationpolicybase.cpp codegenerationwizardbase.cpp codeviewerdialogbase.cpp codevieweroptionsbase.cpp diagrampropertiespage.cpp exportallviewsdialogbase.cpp umlrolepropertiesbase.cpp  umltemplatedialog.moc umlroleproperties.moc umlrolepropertiesbase.moc pkgcontentspage.moc exportallviewsdialogbase.moc activitypage.moc codevieweroptionsbase.moc activitydialog.moc exportallviewsdialog.moc umlviewdialog.moc codegenerationpolicybase.moc diagrampropertiespage.moc codegenerationoptionspage.moc classpropdlg.moc codegenerationwizard.moc assocpage.moc classgenpage.moc codegenerationpolicypage.moc assocrolepage.moc codegenerationwizardbase.moc umlroledialog.moc classifierlistpage.moc codeeditor.moc statedialog.moc overwritedialogue.moc codegenerationoptionsbase.moc assocgenpage.moc umlattributedialog.moc codeviewerdialog.moc selectopdlg.moc assocpropdlg.moc codeviewerdialogbase.moc umloperationdialog.moc umlwidgetcolorpage.moc defaultcodegenpolicypage.moc diagramprintpage.moc settingsdlg.moc codevieweroptionspage.moc umlentityattributedialog.moc
- 	@echo 'creating libdialogs_la.all_cpp.cpp ...'; \
- 	rm -f libdialogs_la.all_cpp.files libdialogs_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libdialogs_la.all_cpp.final; \
---- umbrello/umbrello/docgenerators/Makefile.in
-+++ umbrello/umbrello/docgenerators/Makefile.in
-@@ -0,0 +1,909 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+
-+
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+bin_PROGRAMS = umbodoc$(EXEEXT)
-+subdir = umbrello/umbrello/docgenerators
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-+	"$(DESTDIR)$(appdir)"
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+libdocgenerators_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+am_libdocgenerators_la_OBJECTS = docbookgenerator.lo xhtmlgenerator.lo
-+#>- libdocgenerators_la_OBJECTS = $(am_libdocgenerators_la_OBJECTS)
-+#>+ 4
-+libdocgenerators_la_final_OBJECTS = libdocgenerators_la.all_cpp.lo 
-+libdocgenerators_la_nofinal_OBJECTS = docbookgenerator.lo xhtmlgenerator.lo
-+ at KDE_USE_FINAL_FALSE@libdocgenerators_la_OBJECTS = $(libdocgenerators_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@libdocgenerators_la_OBJECTS = $(libdocgenerators_la_final_OBJECTS)
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+PROGRAMS = $(bin_PROGRAMS)
-+am_umbodoc_OBJECTS = main.$(OBJEXT)
-+#>- umbodoc_OBJECTS = $(am_umbodoc_OBJECTS)
-+#>+ 1
-+umbodoc_OBJECTS = main.$(OBJEXT)
-+umbodoc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libdocgenerators_la_SOURCES) $(umbodoc_SOURCES)
-+DIST_SOURCES = $(libdocgenerators_la_SOURCES) $(umbodoc_SOURCES)
-+appDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(app_DATA)
-+HEADERS = $(noinst_HEADERS)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBIV_INCLUDES = @DBIV_INCLUDES@
-+DBIV_LDFLAGS = @DBIV_LDFLAGS@
-+DBIV_NAME = @DBIV_NAME@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GMSGFMT = @GMSGFMT@
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/docgenerators/Makefile.in kdesdk-3.5.5/umbrello/umbrello/docgenerators/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/docgenerators/Makefile.in	2006-10-02 20:29:35.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/docgenerators/Makefile.in	2006-10-10 00:58:55.000000000 +0200
+@@ -160,6 +160,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
 +GREP = @GREP@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+KCACHEGRIND_VERSION = @KCACHEGRIND_VERSION@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KMTRACE_LIBS = @KMTRACE_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LEX = @LEX@
-+LEXLIB = @LEXLIB@
-+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBDL = @LIBDL@
-+LIBJPEG = @LIBJPEG@
-+LIBOBJS = @LIBOBJS@
-+LIBPNG = @LIBPNG@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBS = @LIBS@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
-+LIBZ = @LIBZ@
-+LIB_DBIV = @LIB_DBIV@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_X11 = @LIB_X11@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XRENDER = @LIB_XRENDER@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -245,6 +246,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+SVNCONFIG = @SVNCONFIG@
-+SVNLD = @SVNLD@
-+SVN_CPPFLAGS = @SVN_CPPFLAGS@
-+SVN_INCLUDE = @SVN_INCLUDE@
-+SVN_LIB = @SVN_LIB@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -285,18 +289,16 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
 +XMKMF = @XMKMF@
-+XMLLINT = @XMLLINT@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
-+cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
-+datadir = @datadir@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -317,14 +319,18 @@
+ cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
+ cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
+ datadir = @datadir@
 +datarootdir = @datarootdir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
 +docdir = @docdir@
 +dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 +htmldir = @htmldir@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-+include_DBSEARCHENGINE_TRUE = @include_DBSEARCHENGINE_TRUE@
-+include_kcalresource_FALSE = @include_kcalresource_FALSE@
-+include_kcalresource_TRUE = @include_kcalresource_TRUE@
-+include_kioslave_svn_FALSE = @include_kioslave_svn_FALSE@
-+include_kioslave_svn_TRUE = @include_kioslave_svn_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+kapptemplate_SUBDIR_included_FALSE = @kapptemplate_SUBDIR_included_FALSE@
-+kapptemplate_SUBDIR_included_TRUE = @kapptemplate_SUBDIR_included_TRUE@
-+kbabel_SUBDIR_included_FALSE = @kbabel_SUBDIR_included_FALSE@
-+kbabel_SUBDIR_included_TRUE = @kbabel_SUBDIR_included_TRUE@
-+kbugbuster_SUBDIR_included_FALSE = @kbugbuster_SUBDIR_included_FALSE@
-+kbugbuster_SUBDIR_included_TRUE = @kbugbuster_SUBDIR_included_TRUE@
-+kcachegrind_SUBDIR_included_FALSE = @kcachegrind_SUBDIR_included_FALSE@
-+kcachegrind_SUBDIR_included_TRUE = @kcachegrind_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdeaccounts_plugin_SUBDIR_included_FALSE = @kdeaccounts_plugin_SUBDIR_included_FALSE@
-+kdeaccounts_plugin_SUBDIR_included_TRUE = @kdeaccounts_plugin_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kfile_plugins_SUBDIR_included_FALSE = @kfile_plugins_SUBDIR_included_FALSE@
-+kfile_plugins_SUBDIR_included_TRUE = @kfile_plugins_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+kmtrace_SUBDIR_included_FALSE = @kmtrace_SUBDIR_included_FALSE@
-+kmtrace_SUBDIR_included_TRUE = @kmtrace_SUBDIR_included_TRUE@
-+kompare_SUBDIR_included_FALSE = @kompare_SUBDIR_included_FALSE@
-+kompare_SUBDIR_included_TRUE = @kompare_SUBDIR_included_TRUE@
-+kprofilemethod_SUBDIR_included_FALSE = @kprofilemethod_SUBDIR_included_FALSE@
-+kprofilemethod_SUBDIR_included_TRUE = @kprofilemethod_SUBDIR_included_TRUE@
-+kspy_SUBDIR_included_FALSE = @kspy_SUBDIR_included_FALSE@
-+kspy_SUBDIR_included_TRUE = @kspy_SUBDIR_included_TRUE@
-+kstartperf_SUBDIR_included_FALSE = @kstartperf_SUBDIR_included_FALSE@
-+kstartperf_SUBDIR_included_TRUE = @kstartperf_SUBDIR_included_TRUE@
-+kuiviewer_SUBDIR_included_FALSE = @kuiviewer_SUBDIR_included_FALSE@
-+kuiviewer_SUBDIR_included_TRUE = @kuiviewer_SUBDIR_included_TRUE@
-+kunittest_SUBDIR_included_FALSE = @kunittest_SUBDIR_included_FALSE@
-+kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
+@@ -391,14 +397,17 @@
+ kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
 +localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
-+poxml_SUBDIR_included_FALSE = @poxml_SUBDIR_included_FALSE@
-+poxml_SUBDIR_included_TRUE = @poxml_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
+ poxml_SUBDIR_included_FALSE = @poxml_SUBDIR_included_FALSE@
+ poxml_SUBDIR_included_TRUE = @poxml_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
 +psdir = @psdir@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+scheck_SUBDIR_included_FALSE = @scheck_SUBDIR_included_FALSE@
-+scheck_SUBDIR_included_TRUE = @scheck_SUBDIR_included_TRUE@
-+scripts_SUBDIR_included_FALSE = @scripts_SUBDIR_included_FALSE@
-+scripts_SUBDIR_included_TRUE = @scripts_SUBDIR_included_TRUE@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+umbrello_SUBDIR_included_FALSE = @umbrello_SUBDIR_included_FALSE@
-+umbrello_SUBDIR_included_TRUE = @umbrello_SUBDIR_included_TRUE@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/umbrello/docgenerators -I../../../umbrello/umbrello $(LIBXML_CFLAGS) $(all_includes)
-+#>- METASOURCES = AUTO
-+AM_LDFLAGS = $(all_libraries)
-+umbodoc_COMPILE_FIRST = version.h
-+umbodoc_SOURCES = main.cpp
-+umbodoc_LDADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
-+lib_LTLIBRARIES = libdocgenerators.la
-+noinst_HEADERS = docbookgenerator.h version.h
-+libdocgenerators_la_SOURCES = docbookgenerator.h docbookgenerator.cpp xhtmlgenerator.cpp
-+libdocgenerators_la_LIBADD = $(LIB_KDECORE) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
-+appdir = $(kde_datadir)/umbrello
-+app_DATA = xmi2docbook.xsl docbook2xhtml.xsl xmi.css common.ent
-+CLEANFILES = version.h
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -441,7 +450,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/docgenerators/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -450,9 +459,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/docgenerators/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/docgenerators/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -462,9 +471,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/docgenerators/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/docgenerators/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/docgenerators/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -479,9 +488,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-libLTLIBRARIES:
-+	@$(NORMAL_UNINSTALL)
-+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+	done
-+
-+clean-libLTLIBRARIES:
-+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+libdocgenerators.la: $(libdocgenerators_la_OBJECTS) $(libdocgenerators_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libdocgenerators_la_LDFLAGS) $(libdocgenerators_la_OBJECTS) $(libdocgenerators_la_LIBADD) $(LIBS)
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  if test -f $$p \
-+	     || test -f $$p1 \
-+	  ; then \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+	done
-+
-+clean-binPROGRAMS:
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+umbodoc$(EXEEXT): $(umbodoc_OBJECTS) $(umbodoc_DEPENDENCIES) 
-+	@rm -f umbodoc$(EXEEXT)
-+	$(CXXLINK) $(umbodoc_LDFLAGS) $(umbodoc_OBJECTS) $(umbodoc_LDADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/docbookgenerator.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xhtmlgenerator.Plo at am__quote@
-+
-+.cpp.o:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+install-appDATA: $(app_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(appdir)" || $(mkdir_p) "$(DESTDIR)$(appdir)"
-+	@list='$(app_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(appDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdir)/$$f'"; \
-+	  $(appDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdir)/$$f"; \
-+	done
-+
-+uninstall-appDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(app_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(appdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(appdir)/$$f"; \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	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)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
-+install-binPROGRAMS: install-libLTLIBRARIES
-+
-+installdirs:
-+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-+#>- 	clean-libtool mostlyclean-am
-+#>+ 2
-+clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-+	clean-libtool mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-appDATA
-+
-+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-appDATA uninstall-binPROGRAMS \
-+	uninstall-info-am uninstall-libLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-+	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
-+	distclean distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-appDATA \
-+	install-binPROGRAMS install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am \
-+	install-libLTLIBRARIES install-man install-strip installcheck \
-+	installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-appDATA \
-+	uninstall-binPROGRAMS uninstall-info-am \
-+	uninstall-libLTLIBRARIES
-+
-+
-+version.h: $(top_srcdir)/umbrello/VERSION
-+	printf "#undef UMBRELLO_VERSION\n#define UMBRELLO_VERSION \"`cat $(top_srcdir)/umbrello/VERSION`\"\n" > version.h
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 3
-+docbookgenerator.moc: $(srcdir)/docbookgenerator.h
-+	$(MOC) $(srcdir)/docbookgenerator.h -o docbookgenerator.moc
-+
-+#>+ 2
-+mocs: docbookgenerator.moc
-+
-+#>+ 3
-+xhtmlgenerator.moc: $(srcdir)/xhtmlgenerator.h
-+	$(MOC) $(srcdir)/xhtmlgenerator.h -o xhtmlgenerator.moc
-+
-+#>+ 2
-+mocs: xhtmlgenerator.moc
-+
-+#>+ 3
-+clean-metasources:
-+	-rm -f  docbookgenerator.moc xhtmlgenerator.moc
-+
-+#>+ 2
-+KDE_DIST=Makefile.in xmi2docbook.sh xhtmlgenerator.h xmi.css xmi2docbook.xsl configure.in.in docbook2xhtml.xsl common.ent Makefile.am 
-+
-+#>+ 2
-+docs-am:
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/docgenerators/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+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 ! $(CXXCOMPILE)  --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
-+
-+
-+#>+ 11
-+libdocgenerators_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/docbookgenerator.cpp $(srcdir)/xhtmlgenerator.cpp  xhtmlgenerator.moc docbookgenerator.moc
-+	@echo 'creating libdocgenerators_la.all_cpp.cpp ...'; \
-+	rm -f libdocgenerators_la.all_cpp.files libdocgenerators_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libdocgenerators_la.all_cpp.final; \
-+	for file in docbookgenerator.cpp xhtmlgenerator.cpp ; do \
-+	  echo "#include \"$$file\"" >> libdocgenerators_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdocgenerators_la.all_cpp.final; \
-+	done; \
-+	cat libdocgenerators_la.all_cpp.final libdocgenerators_la.all_cpp.files > libdocgenerators_la.all_cpp.cpp; \
-+	rm -f libdocgenerators_la.all_cpp.final libdocgenerators_la.all_cpp.files
-+
-+#>+ 3
-+clean-final:
-+	-rm -f libdocgenerators_la.all_cpp.cpp
-+
-+#>+ 3
-+final:
-+	$(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_final_OBJECTS)" all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_final_OBJECTS)" install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_nofinal_OBJECTS)" all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) libdocgenerators_la_OBJECTS="$(libdocgenerators_la_nofinal_OBJECTS)" install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 8
-+nmcheck: 
-+docbookgenerator.lo: docbookgenerator.moc 
-+xhtmlgenerator.lo: xhtmlgenerator.moc 
-+docbookgenerator.o: docbookgenerator.moc 
-+nmcheck-am: nmcheck
-+$(srcdir)/main.cpp: version.h 
-+xhtmlgenerator.o: xhtmlgenerator.moc 
---- umbrello/umbrello/headings/Makefile.in
-+++ umbrello/umbrello/headings/Makefile.in
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+@@ -802,9 +811,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/docgenerators/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/docgenerators/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/docgenerators/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/docgenerators/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/headings/Makefile.in kdesdk-3.5.5/umbrello/umbrello/headings/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/headings/Makefile.in	2006-10-02 20:29:35.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/headings/Makefile.in	2006-10-10 00:58:55.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -68739,20 +65419,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68762,7 +65429,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -68782,7 +65449,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -68801,7 +65468,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -68819,7 +65486,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -382,7 +397,7 @@
+@@ -388,7 +397,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -68828,7 +65495,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -420,9 +435,9 @@
+@@ -397,9 +406,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/headings/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/headings/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/headings/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/headings/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -409,9 +418,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/headings/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/headings/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/headings/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/headings/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/headings/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -426,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68840,59 +65531,22 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- umbrello/umbrello/Makefile.in
-+++ umbrello/umbrello/Makefile.in
-@@ -77,7 +77,7 @@
- 	entityattribute.$(OBJEXT) entitywidget.$(OBJEXT) \
- 	enum.$(OBJEXT) enumliteral.$(OBJEXT) enumwidget.$(OBJEXT) \
- 	floatingtextwidget.$(OBJEXT) \
--	floatingtextwidgetcontroller.$(OBJEXT) \
-+	floatingtextwidgetcontroller.$(OBJEXT) folder.$(OBJEXT) \
- 	forkjoinwidget.$(OBJEXT) kplayerslideraction.$(OBJEXT) \
- 	hierarchicalcodeblock.$(OBJEXT) import_rose.$(OBJEXT) \
- 	infowidget.$(OBJEXT) kstartuplogo.$(OBJEXT) linepath.$(OBJEXT) \
-@@ -106,8 +106,8 @@
- 	umlviewcanvas.$(OBJEXT) umlviewimageexporter.$(OBJEXT) \
- 	umlviewimageexporterall.$(OBJEXT) \
- 	umlviewimageexportermodel.$(OBJEXT) umlwidget.$(OBJEXT) \
--	umlwidgetcontroller.$(OBJEXT) usecase.$(OBJEXT) \
--	usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
-+	umlwidgetcontroller.$(OBJEXT) uniqueid.$(OBJEXT) \
-+	usecase.$(OBJEXT) usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
- 	widget_utils.$(OBJEXT) worktoolbar.$(OBJEXT)
- #>- umbrello_OBJECTS = $(am_umbrello_OBJECTS)
- #>+ 56
-@@ -133,7 +133,7 @@
- 	entityattribute.$(OBJEXT) entitywidget.$(OBJEXT) \
- 	enum.$(OBJEXT) enumliteral.$(OBJEXT) enumwidget.$(OBJEXT) \
- 	floatingtextwidget.$(OBJEXT) \
--	floatingtextwidgetcontroller.$(OBJEXT) \
-+	floatingtextwidgetcontroller.$(OBJEXT) folder.$(OBJEXT) \
- 	forkjoinwidget.$(OBJEXT) kplayerslideraction.$(OBJEXT) \
- 	hierarchicalcodeblock.$(OBJEXT) import_rose.$(OBJEXT) \
- 	infowidget.$(OBJEXT) kstartuplogo.$(OBJEXT) linepath.$(OBJEXT) \
-@@ -162,8 +162,8 @@
- 	umlviewcanvas.$(OBJEXT) umlviewimageexporter.$(OBJEXT) \
- 	umlviewimageexporterall.$(OBJEXT) \
- 	umlviewimageexportermodel.$(OBJEXT) umlwidget.$(OBJEXT) \
--	umlwidgetcontroller.$(OBJEXT) usecase.$(OBJEXT) \
--	usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
-+	umlwidgetcontroller.$(OBJEXT) uniqueid.$(OBJEXT) \
-+	usecase.$(OBJEXT) usecasewidget.$(OBJEXT) widgetbase.$(OBJEXT) \
- 	widget_utils.$(OBJEXT) worktoolbar.$(OBJEXT)
- @KDE_USE_FINAL_FALSE at umbrello_OBJECTS = $(umbrello_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE at umbrello_OBJECTS = $(umbrello_final_OBJECTS)
-@@ -172,7 +172,8 @@
- 	./codeimport/libcodeimport.la \
- 	./codeimport/kdevcppparser/libkdevcppparser.la \
- 	./clipboard/libclipboard.la ./dialogs/libdialogs.la \
--	./codegenerators/libcodegenerator.la $(am__DEPENDENCIES_1) \
-+	./codegenerators/libcodegenerator.la \
-+	./docgenerators/libdocgenerators.la $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@@ -269,6 +270,7 @@
+@@ -602,9 +611,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/headings/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/headings/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/headings/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/headings/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/headings/Makefile.in
+ 
+ 
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/Makefile.in kdesdk-3.5.5/umbrello/umbrello/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/Makefile.in	2006-10-02 20:29:32.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/Makefile.in	2006-10-10 00:58:54.000000000 +0200
+@@ -270,6 +270,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
  GMSGFMT = @GMSGFMT@
@@ -68900,20 +65554,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -317,6 +319,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -348,6 +356,9 @@
+@@ -355,6 +356,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68923,7 +65564,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -388,18 +399,16 @@
+@@ -395,18 +399,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -68943,7 +65584,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,14 +429,18 @@
+@@ -427,14 +429,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -68962,7 +65603,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -494,14 +507,17 @@
+@@ -501,14 +507,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -68980,37 +65621,8 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -570,6 +586,7 @@
- enumwidget.cpp \
- floatingtextwidget.cpp \
- floatingtextwidgetcontroller.cpp \
-+folder.cpp \
- forkjoinwidget.cpp \
- kplayerslideraction.cpp \
- hierarchicalcodeblock.cpp \
-@@ -631,6 +648,7 @@
- umlviewimageexportermodel.cpp \
- umlwidget.cpp \
- umlwidgetcontroller.cpp \
-+uniqueid.cpp \
- usecase.cpp \
- usecasewidget.cpp \
- widgetbase.cpp \
-@@ -639,10 +657,10 @@
+@@ -671,7 +680,7 @@
  
- 
- #umbrello_LDADD   = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
--umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
-+umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_KDEPRINT) $(LIB_KIO)
- 
- # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
--SUBDIRS = codeimport dialogs clipboard pics codegenerators headings refactoring
-+SUBDIRS = codeimport dialogs docgenerators clipboard pics codegenerators headings refactoring
- KDE_ICON = AUTO
- appdir = $(kde_datadir)/umbrello
- app_DATA = tips umbrelloui.rc
-@@ -662,7 +680,7 @@
- 
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -69018,7 +65630,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -700,9 +718,9 @@
+@@ -680,9 +689,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -692,9 +701,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -709,9 +718,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69030,335 +65666,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -786,6 +804,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/enumwidget.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/floatingtextwidget.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/floatingtextwidgetcontroller.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folder.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/forkjoinwidget.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hierarchicalcodeblock.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/import_rose.Po at am__quote@
-@@ -847,6 +866,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umlviewimageexportermodel.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umlwidget.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/umlwidgetcontroller.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uniqueid.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/usecase.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/usecasewidget.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widget_utils.Po at am__quote@
-@@ -1329,18 +1349,18 @@
- mocs: umlcanvasobject.moc
- 
- #>+ 3
--codeclassfielddeclarationblock.moc: $(srcdir)/codeclassfielddeclarationblock.h
--	$(MOC) $(srcdir)/codeclassfielddeclarationblock.h -o codeclassfielddeclarationblock.moc
-+widgetbase.moc: $(srcdir)/widgetbase.h
-+	$(MOC) $(srcdir)/widgetbase.h -o widgetbase.moc
- 
- #>+ 2
--mocs: codeclassfielddeclarationblock.moc
-+mocs: widgetbase.moc
- 
- #>+ 3
--widgetbase.moc: $(srcdir)/widgetbase.h
--	$(MOC) $(srcdir)/widgetbase.h -o widgetbase.moc
-+codeclassfielddeclarationblock.moc: $(srcdir)/codeclassfielddeclarationblock.h
-+	$(MOC) $(srcdir)/codeclassfielddeclarationblock.h -o codeclassfielddeclarationblock.moc
- 
- #>+ 2
--mocs: widgetbase.moc
-+mocs: codeclassfielddeclarationblock.moc
- 
- #>+ 3
- codeoperation.moc: $(srcdir)/codeoperation.h
-@@ -1406,6 +1426,13 @@
- mocs: node.moc
- 
- #>+ 3
-+folder.moc: $(srcdir)/folder.h
-+	$(MOC) $(srcdir)/folder.h -o folder.moc
-+
-+#>+ 2
-+mocs: folder.moc
-+
-+#>+ 3
- codeparameter.moc: $(srcdir)/codeparameter.h
- 	$(MOC) $(srcdir)/codeparameter.h -o codeparameter.moc
- 
-@@ -1455,18 +1482,18 @@
- mocs: enum.moc
- 
- #>+ 3
--association.moc: $(srcdir)/association.h
--	$(MOC) $(srcdir)/association.h -o association.moc
-+operation.moc: $(srcdir)/operation.h
-+	$(MOC) $(srcdir)/operation.h -o operation.moc
- 
- #>+ 2
--mocs: association.moc
-+mocs: operation.moc
- 
- #>+ 3
--operation.moc: $(srcdir)/operation.h
--	$(MOC) $(srcdir)/operation.h -o operation.moc
-+association.moc: $(srcdir)/association.h
-+	$(MOC) $(srcdir)/association.h -o association.moc
- 
- #>+ 2
--mocs: operation.moc
-+mocs: association.moc
- 
- #>+ 3
- activitywidget.moc: $(srcdir)/activitywidget.h
-@@ -1511,18 +1538,18 @@
- mocs: worktoolbar.moc
- 
- #>+ 3
--actor.moc: $(srcdir)/actor.h
--	$(MOC) $(srcdir)/actor.h -o actor.moc
-+package.moc: $(srcdir)/package.h
-+	$(MOC) $(srcdir)/package.h -o package.moc
- 
- #>+ 2
--mocs: actor.moc
-+mocs: package.moc
- 
- #>+ 3
--package.moc: $(srcdir)/package.h
--	$(MOC) $(srcdir)/package.h -o package.moc
-+actor.moc: $(srcdir)/actor.h
-+	$(MOC) $(srcdir)/actor.h -o actor.moc
- 
- #>+ 2
--mocs: package.moc
-+mocs: actor.moc
- 
- #>+ 3
- notewidget.moc: $(srcdir)/notewidget.h
-@@ -1539,18 +1566,18 @@
- mocs: component.moc
- 
- #>+ 3
--codegenerator.moc: $(srcdir)/codegenerator.h
--	$(MOC) $(srcdir)/codegenerator.h -o codegenerator.moc
-+classifiercodedocument.moc: $(srcdir)/classifiercodedocument.h
-+	$(MOC) $(srcdir)/classifiercodedocument.h -o classifiercodedocument.moc
- 
- #>+ 2
--mocs: codegenerator.moc
-+mocs: classifiercodedocument.moc
- 
- #>+ 3
--classifiercodedocument.moc: $(srcdir)/classifiercodedocument.h
--	$(MOC) $(srcdir)/classifiercodedocument.h -o classifiercodedocument.moc
-+codegenerator.moc: $(srcdir)/codegenerator.h
-+	$(MOC) $(srcdir)/codegenerator.h -o codegenerator.moc
- 
- #>+ 2
--mocs: classifiercodedocument.moc
-+mocs: codegenerator.moc
- 
- #>+ 3
- floatingtextwidget.moc: $(srcdir)/floatingtextwidget.h
-@@ -1560,18 +1587,18 @@
- mocs: floatingtextwidget.moc
- 
- #>+ 3
--umldoc.moc: $(srcdir)/umldoc.h
--	$(MOC) $(srcdir)/umldoc.h -o umldoc.moc
-+codedocument.moc: $(srcdir)/codedocument.h
-+	$(MOC) $(srcdir)/codedocument.h -o codedocument.moc
- 
- #>+ 2
--mocs: umldoc.moc
-+mocs: codedocument.moc
- 
- #>+ 3
--codedocument.moc: $(srcdir)/codedocument.h
--	$(MOC) $(srcdir)/codedocument.h -o codedocument.moc
-+umldoc.moc: $(srcdir)/umldoc.h
-+	$(MOC) $(srcdir)/umldoc.h -o umldoc.moc
- 
- #>+ 2
--mocs: codedocument.moc
-+mocs: umldoc.moc
- 
- #>+ 3
- classifierlistitem.moc: $(srcdir)/classifierlistitem.h
-@@ -1603,66 +1630,66 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  codeclassfield.moc hierarchicalcodeblock.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc statewidget.moc codeblock.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc codeclassfielddeclarationblock.moc widgetbase.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc association.moc operation.moc activitywidget.moc docwindow.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc actor.moc package.moc notewidget.moc component.moc codegenerator.moc classifiercodedocument.moc floatingtextwidget.moc umldoc.moc codedocument.moc classifierlistitem.moc umlobject.moc ownedcodeblock.moc umlview.moc
-+	-rm -f  codeclassfield.moc hierarchicalcodeblock.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc statewidget.moc codeblock.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc widgetbase.moc codeclassfielddeclarationblock.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc folder.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc operation.moc association.moc activitywidget.moc docwindow.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc package.moc actor.moc notewidget.moc component.moc classifiercodedocument.moc codegenerator.moc floatingtextwidget.moc codedocument.moc umldoc.moc classifierlistitem.moc umlobject.moc ownedcodeblock.moc umlview.moc
- 
- #>+ 2
--KDE_DIST=actorwidget.h umlviewlist.h umllistviewitemlist.h messagewidgetcontroller.h messagewidgetlist.h ownedcodeblock.h cr48-mime-umbrellofile.png attribute.h x-umbrello.desktop component.h artifactwidget.h petalnode.h umlwidgetlist.h classifiercodedocument.h classifierwidget.h operation.h hierarchicalcodeblock.h objectwidgetcontroller.h artifact.h widget_utils.h enumwidget.h cr64-mime-umbrellofile.png codeaccessormethodlist.h umlnamespace.h optionstate.h umlassociationlist.h aligntoolbar.h template.h Makefile.in toolbarstatemessages.h package.h codeaccessormethod.h worktoolbar.h umlstereotypelist.h codecomment.h codegenobjectwithtextblocks.h textblock.h cr16-mime-umbrellofile.png listpopupmenu.h hi32-app-umbrello.png umlviewcanvas.h inputdialog.h kstartuplogo.h umlwidget.h assocrules.h umlrole.h messagewidget.h hi32-mime-umbrellofile.png codemethodblock.h umlviewimageexporterall.h association.h hi22-app-umbrello.png cr22-mime-umbrellofile.png datatype.h umldatatypelist.h actor.h hi16-mime-umbrellofile.png hi48-app-umbrello.png stereotype.h linepath.h umlwidgetcontroller.h codeviewerstate.h associationwidgetlist.h seqlinewidget.h codeparameter.h usecasewidget.h codeclassfield.h cmdlineexportallviewsevent.h usecase.h dialog_utils.h umlattributelist.h configurable.h notewidgetcontroller.h codeblock.h umlviewimageexportermodel.h classifierlistitem.h packagewidget.h associationwidget.h hi64-app-umbrello.png plugin.h classifier.h entityattribute.h enumliteral.h umlentityattributelist.h umlenumliterallist.h umllistview.h umbrello.desktop umlclassifierlistitemlist.h codeoperation.h umloperationlist.h tips codegenerator.h activitywidget.h toolbarstatepool.h objectwidget.h boxwidget.h umllistviewitem.h pluginloader.h umlviewimageexporter.h toolbarstatearrow.h umlobjectlist.h model_utils.h hisc-app-umbrello.svgz umbrelloui.rc cr128-mime-umbrellofile.png umlcanvasobject.h widgetbase.h codedocument.h textblocklist.h petaltree2uml.h hi16-app-umbrello.png forkjoinwidget.h toolbarstateother.h ownedhierarchicalcodeblock.h node.h kplayerslideraction.h notewidget.h codeclassfielddeclarationblock.h docwindow.h codegenerationpolicy.h codeclassfieldlist.h infowidget.h import_rose.h datatypewidget.h cr32-mime-umbrellofile.png enum.h toolbarstateassociation.h toolbarstatefactory.h umlview.h entitywidget.h object_factory.h umldoc.h entity.h umlclassifierlist.h floatingtextwidgetcontroller.h hi128-app-umbrello.png crsc-mime-umbrellofile.svgz toolbarstate.h uml.h statewidget.h codeblockwithcomments.h umlpackagelist.h nodewidget.h codedocumentlist.h umltemplatelist.h linkwidget.h floatingtextwidget.h umlobject.h Makefile.am componentwidget.h 
-+KDE_DIST=actorwidget.h umllistviewitemlist.h umlviewlist.h messagewidgetcontroller.h messagewidgetlist.h ownedcodeblock.h cr48-mime-umbrellofile.png attribute.h x-umbrello.desktop component.h artifactwidget.h petalnode.h umlwidgetlist.h classifiercodedocument.h classifierwidget.h operation.h hierarchicalcodeblock.h objectwidgetcontroller.h artifact.h widget_utils.h enumwidget.h cr64-mime-umbrellofile.png umlnamespace.h codeaccessormethodlist.h optionstate.h umlassociationlist.h aligntoolbar.h template.h Makefile.in toolbarstatemessages.h package.h codeaccessormethod.h worktoolbar.h umlstereotypelist.h codecomment.h textblock.h codegenobjectwithtextblocks.h cr16-mime-umbrellofile.png hi32-app-umbrello.png listpopupmenu.h umlviewcanvas.h inputdialog.h kstartuplogo.h umlwidget.h assocrules.h umlrole.h messagewidget.h hi32-mime-umbrellofile.png codemethodblock.h umlviewimageexporterall.h association.h hi22-app-umbrello.png datatype.h cr22-mime-umbrellofile.png umldatatypelist.h actor.h hi16-mime-umbrellofile.png hi48-app-umbrello.png stereotype.h linepath.h umlwidgetcontroller.h codeviewerstate.h associationwidgetlist.h seqlinewidget.h codeparameter.h usecasewidget.h codeclassfield.h cmdlineexportallviewsevent.h usecase.h dialog_utils.h umlattributelist.h configurable.h notewidgetcontroller.h codeblock.h umlviewimageexportermodel.h classifierlistitem.h packagewidget.h associationwidget.h hi64-app-umbrello.png plugin.h classifier.h entityattribute.h enumliteral.h folder.h umlentityattributelist.h umlenumliterallist.h umllistview.h umbrello.desktop umlclassifierlistitemlist.h codeoperation.h umloperationlist.h tips codegenerator.h activitywidget.h toolbarstatepool.h objectwidget.h boxwidget.h umllistviewitem.h umlviewimageexporter.h pluginloader.h toolbarstatearrow.h umlobjectlist.h model_utils.h hisc-app-umbrello.svgz umbrelloui.rc cr128-mime-umbrellofile.png umlcanvasobject.h widgetbase.h codedocument.h textblocklist.h petaltree2uml.h hi16-app-umbrello.png forkjoinwidget.h toolbarstateother.h ownedhierarchicalcodeblock.h node.h kplayerslideraction.h notewidget.h codeclassfielddeclarationblock.h docwindow.h codegenerationpolicy.h codeclassfieldlist.h infowidget.h import_rose.h datatypewidget.h cr32-mime-umbrellofile.png enum.h toolbarstateassociation.h toolbarstatefactory.h umlview.h entitywidget.h object_factory.h umldoc.h entity.h umlclassifierlist.h uniqueid.h floatingtextwidgetcontroller.h hi128-app-umbrello.png crsc-mime-umbrellofile.svgz toolbarstate.h uml.h statewidget.h codeblockwithcomments.h umlpackagelist.h codedocumentlist.h nodewidget.h umltemplatelist.h linkwidget.h floatingtextwidget.h Makefile.am umlobject.h componentwidget.h 
- 
- #>+ 2
- docs-am:
- 
- #>+ 52
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr16-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/umbrellofile.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/umbrello.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/umbrello.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/umbrello.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/umbrello.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr48-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/umbrellofile.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/hisc-app-umbrello.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/umbrello.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr128-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/umbrellofile.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/umbrello.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes
--	$(INSTALL_DATA) $(srcdir)/hi32-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes/umbrellofile.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes
--	$(INSTALL_DATA) $(srcdir)/hi16-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes/umbrellofile.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-umbrello.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/umbrello.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/umbrello.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/umbrellofile.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/hi32-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes/umbrellofile.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
- 	$(INSTALL_DATA) $(srcdir)/cr32-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/umbrellofile.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
--	$(INSTALL_DATA) $(srcdir)/crsc-mime-umbrellofile.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/umbrellofile.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/umbrellofile.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/umbrello.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
- 	$(INSTALL_DATA) $(srcdir)/cr22-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/umbrellofile.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr64-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/umbrellofile.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/umbrello.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/umbrello.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-umbrellofile.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/umbrellofile.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/umbrellofile.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/hi16-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes/umbrellofile.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr16-mime-umbrellofile.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/umbrellofile.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-umbrello.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/umbrello.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/umbrellofile.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/umbrello.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/umbrello.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/umbrello.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/umbrello.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/umbrellofile.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/umbrello.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/umbrellofile.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/umbrello.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes/umbrellofile.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes/umbrellofile.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/umbrello.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/umbrello.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/umbrellofile.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/mimetypes/umbrellofile.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/umbrellofile.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/umbrellofile.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/umbrellofile.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/umbrello.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/umbrellofile.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/umbrellofile.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/umbrello.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/umbrello.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/umbrellofile.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/umbrellofile.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/mimetypes/umbrellofile.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/umbrellofile.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/umbrello.png
- 
- #>+ 15
- force-reedit:
-@@ -1703,11 +1730,11 @@
- 
- 
- #>+ 11
--umbrello.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitywidget.cpp $(srcdir)/actor.cpp $(srcdir)/actorwidget.cpp $(srcdir)/aligntoolbar.cpp $(srcdir)/artifact.cpp $(srcdir)/artifactwidget.cpp $(srcdir)/association.cpp $(srcdir)/associationwidget.cpp $(srcdir)/assocrules.cpp $(srcdir)/attribute.cpp $(srcdir)/boxwidget.cpp $(srcdir)/classifier.cpp $(srcdir)/classifiercodedocument.cpp $(srcdir)/classifierlistitem.cpp $(srcdir)/classifierwidget.cpp $(srcdir)/cmdlineexportallviewsevent.cpp $(srcdir)/codeaccessormethod.cpp $(srcdir)/codeblock.cpp $(srcdir)/codeblockwithcomments.cpp $(srcdir)/codeclassfield.cpp $(srcdir)/codeclassfielddeclarationblock.cpp $(srcdir)/codecomment.cpp $(srcdir)/codedocument.cpp $(srcdir)/codegenerationpolicy.cpp $(srcdir)/codegenerator.cpp $(srcdir)/codegenobjectwithtextblocks.cpp $(srcdir)/codemethodblock.cpp $(srcdir)/codeoperation.cpp $(srcdir)/codeparameter.cpp $(srcdir)/component.cpp $(srcdir)/componentwidget.cpp $(srcdir)/configurable.cpp $(srcdir)/datatype.cpp $(srcdir)/datatypewidget.cpp $(srcdir)/dialog_utils.cpp $(srcdir)/docwindow.cpp $(srcdir)/entity.cpp $(srcdir)/entityattribute.cpp $(srcdir)/entitywidget.cpp $(srcdir)/enum.cpp $(srcdir)/enumliteral.cpp $(srcdir)/enumwidget.cpp $(srcdir)/floatingtextwidget.cpp $(srcdir)/floatingtextwidgetcontroller.cpp $(srcdir)/forkjoinwidget.cpp $(srcdir)/kplayerslideraction.cpp $(srcdir)/hierarchicalcodeblock.cpp $(srcdir)/import_rose.cpp $(srcdir)/infowidget.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/linepath.cpp $(srcdir)/linkwidget.cpp $(srcdir)/listpopupmenu.cpp $(srcdir)/main.cpp $(srcdir)/messagewidget.cpp $(srcdir)/messagewidgetcontroller.cpp $(srcdir)/model_utils.cpp $(srcdir)/node.cpp $(srcdir)/nodewidget.cpp $(srcdir)/notewidget.cpp $(srcdir)/notewidgetcontroller.cpp $(srcdir)/objectwidget.cpp $(srcdir)/objectwidgetcontroller.cpp $(srcdir)/object_factory.cpp $(srcdir)/operation.cpp $(srcdir)/optionstate.cpp $(srcdir)/ownedcodeblock.cpp $(srcdir)/ownedhierarchicalcodeblock.cpp $(srcdir)/package.cpp $(srcdir)/packagewidget.cpp $(srcdir)/petalnode.cpp $(srcdir)/petaltree2uml.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginloader.cpp $(srcdir)/seqlinewidget.cpp $(srcdir)/statewidget.cpp $(srcdir)/stereotype.cpp $(srcdir)/template.cpp $(srcdir)/textblock.cpp $(srcdir)/toolbarstate.cpp $(srcdir)/toolbarstatearrow.cpp $(srcdir)/toolbarstateassociation.cpp $(srcdir)/toolbarstatefactory.cpp $(srcdir)/toolbarstatemessages.cpp $(srcdir)/toolbarstateother.cpp $(srcdir)/toolbarstatepool.cpp $(srcdir)/uml.cpp $(srcdir)/umlattributelist.cpp $(srcdir)/umlentityattributelist.cpp $(srcdir)/umlcanvasobject.cpp $(srcdir)/umlclassifierlistitemlist.cpp $(srcdir)/umldoc.cpp $(srcdir)/umllistview.cpp $(srcdir)/umllistviewitem.cpp $(srcdir)/umlnamespace.cpp $(srcdir)/umlobject.cpp $(srcdir)/umlobjectlist.cpp $(srcdir)/umlrole.cpp $(srcdir)/umlview.cpp $(srcdir)/umlviewcanvas.cpp $(srcdir)/umlviewimageexporter.cpp $(srcdir)/umlviewimageexporterall.cpp $(srcdir)/umlviewimageexportermodel.cpp $(srcdir)/umlwidget.cpp $(srcdir)/umlwidgetcontroller.cpp $(srcdir)/usecase.cpp $(srcdir)/usecasewidget.cpp $(srcdir)/widgetbase.cpp $(srcdir)/widget_utils.cpp $(srcdir)/worktoolbar.cpp  hierarchicalcodeblock.moc codeclassfield.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc codeblock.moc statewidget.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc codeclassfielddeclarationblock.moc widgetbase.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc operation.moc association.moc docwindow.moc activitywidget.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc package.moc actor.moc component.moc notewidget.moc classifiercodedocument.moc codegenerator.moc floatingtextwidget.moc umlobject.moc classifierlistitem.moc codedocument.moc umldoc.moc umlview.moc ownedcodeblock.moc
-+umbrello.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/activitywidget.cpp $(srcdir)/actor.cpp $(srcdir)/actorwidget.cpp $(srcdir)/aligntoolbar.cpp $(srcdir)/artifact.cpp $(srcdir)/artifactwidget.cpp $(srcdir)/association.cpp $(srcdir)/associationwidget.cpp $(srcdir)/assocrules.cpp $(srcdir)/attribute.cpp $(srcdir)/boxwidget.cpp $(srcdir)/classifier.cpp $(srcdir)/classifiercodedocument.cpp $(srcdir)/classifierlistitem.cpp $(srcdir)/classifierwidget.cpp $(srcdir)/cmdlineexportallviewsevent.cpp $(srcdir)/codeaccessormethod.cpp $(srcdir)/codeblock.cpp $(srcdir)/codeblockwithcomments.cpp $(srcdir)/codeclassfield.cpp $(srcdir)/codeclassfielddeclarationblock.cpp $(srcdir)/codecomment.cpp $(srcdir)/codedocument.cpp $(srcdir)/codegenerationpolicy.cpp $(srcdir)/codegenerator.cpp $(srcdir)/codegenobjectwithtextblocks.cpp $(srcdir)/codemethodblock.cpp $(srcdir)/codeoperation.cpp $(srcdir)/codeparameter.cpp $(srcdir)/component.cpp $(srcdir)/componentwidget.cpp $(srcdir)/configurable.cpp $(srcdir)/datatype.cpp $(srcdir)/datatypewidget.cpp $(srcdir)/dialog_utils.cpp $(srcdir)/docwindow.cpp $(srcdir)/entity.cpp $(srcdir)/entityattribute.cpp $(srcdir)/entitywidget.cpp $(srcdir)/enum.cpp $(srcdir)/enumliteral.cpp $(srcdir)/enumwidget.cpp $(srcdir)/floatingtextwidget.cpp $(srcdir)/floatingtextwidgetcontroller.cpp $(srcdir)/folder.cpp $(srcdir)/forkjoinwidget.cpp $(srcdir)/kplayerslideraction.cpp $(srcdir)/hierarchicalcodeblock.cpp $(srcdir)/import_rose.cpp $(srcdir)/infowidget.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/linepath.cpp $(srcdir)/linkwidget.cpp $(srcdir)/listpopupmenu.cpp $(srcdir)/main.cpp $(srcdir)/messagewidget.cpp $(srcdir)/messagewidgetcontroller.cpp $(srcdir)/model_utils.cpp $(srcdir)/node.cpp $(srcdir)/nodewidget.cpp $(srcdir)/notewidget.cpp $(srcdir)/notewidgetcontroller.cpp $(srcdir)/objectwidget.cpp $(srcdir)/objectwidgetcontroller.cpp $(srcdir)/object_factory.cpp $(srcdir)/operation.cpp $(srcdir)/optionstate.cpp $(srcdir)/ownedcodeblock.cpp $(srcdir)/ownedhierarchicalcodeblock.cpp $(srcdir)/package.cpp $(srcdir)/packagewidget.cpp $(srcdir)/petalnode.cpp $(srcdir)/petaltree2uml.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginloader.cpp $(srcdir)/seqlinewidget.cpp $(srcdir)/statewidget.cpp $(srcdir)/stereotype.cpp $(srcdir)/template.cpp $(srcdir)/textblock.cpp $(srcdir)/toolbarstate.cpp $(srcdir)/toolbarstatearrow.cpp $(srcdir)/toolbarstateassociation.cpp $(srcdir)/toolbarstatefactory.cpp $(srcdir)/toolbarstatemessages.cpp $(srcdir)/toolbarstateother.cpp $(srcdir)/toolbarstatepool.cpp $(srcdir)/uml.cpp $(srcdir)/umlattributelist.cpp $(srcdir)/umlentityattributelist.cpp $(srcdir)/umlcanvasobject.cpp $(srcdir)/umlclassifierlistitemlist.cpp $(srcdir)/umldoc.cpp $(srcdir)/umllistview.cpp $(srcdir)/umllistviewitem.cpp $(srcdir)/umlnamespace.cpp $(srcdir)/umlobject.cpp $(srcdir)/umlobjectlist.cpp $(srcdir)/umlrole.cpp $(srcdir)/umlview.cpp $(srcdir)/umlviewcanvas.cpp $(srcdir)/umlviewimageexporter.cpp $(srcdir)/umlviewimageexporterall.cpp $(srcdir)/umlviewimageexportermodel.cpp $(srcdir)/umlwidget.cpp $(srcdir)/umlwidgetcontroller.cpp $(srcdir)/uniqueid.cpp $(srcdir)/usecase.cpp $(srcdir)/usecasewidget.cpp $(srcdir)/widgetbase.cpp $(srcdir)/widget_utils.cpp $(srcdir)/worktoolbar.cpp  hierarchicalcodeblock.moc codeclassfield.moc textblock.moc kplayerslideraction.moc aligntoolbar.moc codeaccessormethod.moc pluginloader.moc objectwidget.moc codeblock.moc statewidget.moc codeblockwithcomments.moc linepath.moc umlcanvasobject.moc widgetbase.moc codeclassfielddeclarationblock.moc codeoperation.moc messagewidget.moc associationwidget.moc umllistview.moc classifier.moc uml.moc umlwidget.moc artifact.moc node.moc folder.moc codeparameter.moc codegenerationpolicy.moc entity.moc codecomment.moc ownedhierarchicalcodeblock.moc codemethodblock.moc enum.moc association.moc operation.moc docwindow.moc activitywidget.moc umlrole.moc plugin.moc kstartuplogo.moc worktoolbar.moc actor.moc package.moc component.moc notewidget.moc codegenerator.moc classifiercodedocument.moc floatingtextwidget.moc umlobject.moc classifierlistitem.moc umldoc.moc codedocument.moc umlview.moc ownedcodeblock.moc
- 	@echo 'creating umbrello.all_cpp.cpp ...'; \
- 	rm -f umbrello.all_cpp.files umbrello.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> umbrello.all_cpp.final; \
--	for file in activitywidget.cpp actor.cpp actorwidget.cpp aligntoolbar.cpp artifact.cpp artifactwidget.cpp association.cpp associationwidget.cpp assocrules.cpp attribute.cpp boxwidget.cpp classifier.cpp classifiercodedocument.cpp classifierlistitem.cpp classifierwidget.cpp cmdlineexportallviewsevent.cpp codeaccessormethod.cpp codeblock.cpp codeblockwithcomments.cpp codeclassfield.cpp codeclassfielddeclarationblock.cpp codecomment.cpp codedocument.cpp codegenerationpolicy.cpp codegenerator.cpp codegenobjectwithtextblocks.cpp codemethodblock.cpp codeoperation.cpp codeparameter.cpp component.cpp componentwidget.cpp configurable.cpp datatype.cpp datatypewidget.cpp dialog_utils.cpp docwindow.cpp entity.cpp entityattribute.cpp entitywidget.cpp enum.cpp enumliteral.cpp enumwidget.cpp floatingtextwidget.cpp floatingtextwidgetcontroller.cpp forkjoinwidget.cpp kplayerslideraction.cpp hierarchicalcodeblock.cpp import_rose.cpp infowidget.cpp kstartuplogo.cpp linepath.cpp linkwidget.cpp listpopupmenu.cpp main.cpp messagewidget.cpp messagewidgetcontroller.cpp model_utils.cpp node.cpp nodewidget.cpp notewidget.cpp notewidgetcontroller.cpp objectwidget.cpp objectwidgetcontroller.cpp object_factory.cpp operation.cpp optionstate.cpp ownedcodeblock.cpp ownedhierarchicalcodeblock.cpp package.cpp packagewidget.cpp petalnode.cpp petaltree2uml.cpp plugin.cpp pluginloader.cpp seqlinewidget.cpp statewidget.cpp stereotype.cpp template.cpp textblock.cpp toolbarstate.cpp toolbarstatearrow.cpp toolbarstateassociation.cpp toolbarstatefactory.cpp toolbarstatemessages.cpp toolbarstateother.cpp toolbarstatepool.cpp uml.cpp umlattributelist.cpp umlentityattributelist.cpp umlcanvasobject.cpp umlclassifierlistitemlist.cpp umldoc.cpp umllistview.cpp umllistviewitem.cpp umlnamespace.cpp umlobject.cpp umlobjectlist.cpp umlrole.cpp umlview.cpp umlviewcanvas.cpp umlviewimageexporter.cpp umlviewimageexporterall.cpp umlviewimageexportermodel.cpp umlwidget.cpp umlwidgetcontroller.cpp usecase.cpp usecasewidget.cpp widgetbase.cpp widget_utils.cpp worktoolbar.cpp ; do \
-+	for file in activitywidget.cpp actor.cpp actorwidget.cpp aligntoolbar.cpp artifact.cpp artifactwidget.cpp association.cpp associationwidget.cpp assocrules.cpp attribute.cpp boxwidget.cpp classifier.cpp classifiercodedocument.cpp classifierlistitem.cpp classifierwidget.cpp cmdlineexportallviewsevent.cpp codeaccessormethod.cpp codeblock.cpp codeblockwithcomments.cpp codeclassfield.cpp codeclassfielddeclarationblock.cpp codecomment.cpp codedocument.cpp codegenerationpolicy.cpp codegenerator.cpp codegenobjectwithtextblocks.cpp codemethodblock.cpp codeoperation.cpp codeparameter.cpp component.cpp componentwidget.cpp configurable.cpp datatype.cpp datatypewidget.cpp dialog_utils.cpp docwindow.cpp entity.cpp entityattribute.cpp entitywidget.cpp enum.cpp enumliteral.cpp enumwidget.cpp floatingtextwidget.cpp floatingtextwidgetcontroller.cpp folder.cpp forkjoinwidget.cpp kplayerslideraction.cpp hierarchicalcodeblock.cpp import_rose.cpp infowidget.cpp kstartuplogo.cpp linepath.cpp linkwidget.cpp listpopupmenu.cpp main.cpp messagewidget.cpp messagewidgetcontroller.cpp model_utils.cpp node.cpp nodewidget.cpp notewidget.cpp notewidgetcontroller.cpp objectwidget.cpp objectwidgetcontroller.cpp object_factory.cpp operation.cpp optionstate.cpp ownedcodeblock.cpp ownedhierarchicalcodeblock.cpp package.cpp packagewidget.cpp petalnode.cpp petaltree2uml.cpp plugin.cpp pluginloader.cpp seqlinewidget.cpp statewidget.cpp stereotype.cpp template.cpp textblock.cpp toolbarstate.cpp toolbarstatearrow.cpp toolbarstateassociation.cpp toolbarstatefactory.cpp toolbarstatemessages.cpp toolbarstateother.cpp toolbarstatepool.cpp uml.cpp umlattributelist.cpp umlentityattributelist.cpp umlcanvasobject.cpp umlclassifierlistitemlist.cpp umldoc.cpp umllistview.cpp umllistviewitem.cpp umlnamespace.cpp umlobject.cpp umlobjectlist.cpp umlrole.cpp umlview.cpp umlviewcanvas.cpp umlviewimageexporter.cpp umlviewimageexporterall.cpp umlviewimageexportermodel.cpp umlwidget.cpp umlwidgetcontroller.cpp uniqueid.cpp usecase.cpp usecasewidget.cpp widgetbase.cpp widget_utils.cpp worktoolbar.cpp ; do \
- 	  echo "#include \"$$file\"" >> umbrello.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> umbrello.all_cpp.final; \
+@@ -1734,9 +1743,9 @@
+ 	      exit 1;; \
+ 	  esac; \
  	done; \
-@@ -1738,7 +1765,7 @@
- kde-rpo-clean:
- 	-rm -f *.rpo
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/Makefile.in
  
--#>+ 217
-+#>+ 221
- $(srcdir)/classifierwidget.cpp: version.h 
- codegenerator.o: codegenerator.moc 
- $(srcdir)/kplayerslideraction.cpp: version.h 
-@@ -1760,6 +1787,7 @@
- nmcheck-am: nmcheck
- entity.o: entity.moc 
- statewidget.o: statewidget.moc 
-+folder.lo: folder.moc 
- $(srcdir)/usecasewidget.cpp: version.h 
- $(srcdir)/codemethodblock.cpp: version.h 
- component.o: component.moc 
-@@ -1831,6 +1859,7 @@
- plugin.lo: plugin.moc 
- $(srcdir)/umlviewimageexporter.cpp: version.h 
- $(srcdir)/entitywidget.cpp: version.h 
-+$(srcdir)/folder.cpp: version.h 
- $(srcdir)/classifiercodedocument.cpp: version.h 
- $(srcdir)/seqlinewidget.cpp: version.h 
- $(srcdir)/artifactwidget.cpp: version.h 
-@@ -1880,8 +1909,8 @@
- $(srcdir)/import_rose.cpp: version.h 
- pluginloader.o: pluginloader.moc 
- objectwidget.lo: objectwidget.moc 
--worktoolbar.lo: worktoolbar.moc 
- $(srcdir)/codeclassfield.cpp: version.h 
-+worktoolbar.lo: worktoolbar.moc 
- $(srcdir)/enumwidget.cpp: version.h 
- plugin.o: plugin.moc 
- $(srcdir)/notewidgetcontroller.cpp: version.h 
-@@ -1892,14 +1921,16 @@
- $(srcdir)/toolbarstatearrow.cpp: version.h 
- codegenerator.lo: codegenerator.moc 
- $(srcdir)/notewidget.cpp: version.h 
--notewidget.o: notewidget.moc 
- $(srcdir)/codeblockwithcomments.cpp: version.h 
-+notewidget.o: notewidget.moc 
- $(srcdir)/worktoolbar.cpp: version.h 
-+$(srcdir)/uniqueid.cpp: version.h 
- $(srcdir)/statewidget.cpp: version.h 
- $(srcdir)/listpopupmenu.cpp: version.h 
- codeblockwithcomments.lo: codeblockwithcomments.moc 
- umlview.lo: umlview.moc 
- $(srcdir)/componentwidget.cpp: version.h 
-+folder.o: folder.moc 
- codecomment.lo: codecomment.moc 
- $(srcdir)/codegenobjectwithtextblocks.cpp: version.h 
- aligntoolbar.o: aligntoolbar.moc 
---- umbrello/umbrello/pics/Makefile.in
-+++ umbrello/umbrello/pics/Makefile.in
+ 
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/pics/Makefile.in kdesdk-3.5.5/umbrello/umbrello/pics/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/pics/Makefile.in	2006-10-02 20:29:35.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/pics/Makefile.in	2006-10-10 00:58:55.000000000 +0200
 @@ -104,6 +104,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -69367,20 +65689,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -152,6 +153,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -183,6 +190,9 @@
+@@ -189,6 +190,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69390,7 +65699,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -223,18 +233,16 @@
+@@ -229,18 +233,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -69410,7 +65719,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -255,14 +263,18 @@
+@@ -261,14 +263,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -69429,7 +65738,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -329,14 +341,17 @@
+@@ -335,14 +341,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -69447,7 +65756,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -474,7 +489,7 @@
+@@ -480,7 +489,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -69456,7 +65765,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -512,9 +527,9 @@
+@@ -489,9 +498,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/pics/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/pics/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/pics/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/pics/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -501,9 +510,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/pics/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -518,9 +527,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69468,86 +65801,21 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -677,51 +692,51 @@
- .NOEXPORT:
+@@ -739,9 +748,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/pics/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/pics/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/pics/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/pics/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/pics/Makefile.in
  
- #>+ 2
--KDE_DIST=CVprivate_signal.png actor.png cursor-enum.png dependency.png cr22-action-umbrello_diagram_state.png cursor-text.png CVprivate_var.png CVglobal_var.png choice-round.png cursor-message-synchronous.png cursor-branch.png CVglobal_meth.png aggregation.png cursor-initial_state.png cursor-anchor.png entity.png cr22-action-umbrello_diagram_activity.png component.png CVprotected_slot.png cursor-actor.png cursor-component.png cr16-action-umbrello_diagram_usecase.png align_top.png andline.png cursor-class.png CVprivate_meth.png subsystem.png containment.png generalisation.png Makefile.in cursor-choice-rhomb.png CVimplementation_signal.png CVimplementation_slot.png node.png cursor-interface.png cr16-action-umbrello_diagram_component.png cr16-action-umbrello_diagram_sequence.png cr16-action-umbrello_diagram_state.png cursor-object.png choice-rhomb.png cursor-node.png cr22-action-umbrello_diagram_deployment.png association.png cursor-uniassociation.png cursor-generalisation.png cursor-note.png cr22-action-umbrello_diagram_sequence.png CVimplementation_var.png uniassociation.png cursor-aggregation.png align_vert_distribute.png cursor-message-asynchronous.png cursor-relationship.png align_left.png artifact.png startlogo.png cursor-state-fork.png cursor-andline.png CVprotected_signal.png cursor-datatype.png CVpublic_meth.png align_right.png join.png branch.png datatype.png cursor-package.png cursor-fork.png arrow.png note.png cr16-action-umbrello_diagram_deployment.png cursor-usecase.png package.png cursor-composition.png fork.png CVimplementation_meth.png cursor-containment.png deep-history.png cr22-action-umbrello_diagram_class.png cr16-action-umbrello_diagram_collaboration.png CVnamespace.png cursor-deep-history.png cursor-artifact.png message-asynchronous.png cr16-action-umbrello_diagram_activity.png align_hori_middle.png enum.png anchor.png cr22-action-umbrello_diagram_entityrelationship.png relationship.png CVpublic_slot.png shallow-history.png cursor-choice-round.png interface.png CVprivate_slot.png cursor-join.png state-fork.png cursor-dependency.png CVpublic_signal.png usecase.png text.png CVprotected_var.png align_bottom.png cursor-end_state.png cursor-junction.png class.png cursor-entity.png junction.png cr16-action-umbrello_diagram_class.png object.png cursor-association.png CVpublic_var.png cr22-action-umbrello_diagram_component.png CVstruct.png CVprotected_meth.png cursor-shallow-history.png end_state.png cursor-box.png align_hori_distribute.png cr22-action-umbrello_diagram_usecase.png message-synchronous.png align_vert_middle.png cr22-action-umbrello_diagram_collaboration.png composition.png initial_state.png box.png template.png Makefile.am 
-+KDE_DIST=CVprivate_signal.png actor.png cursor-enum.png dependency.png cr22-action-umbrello_diagram_state.png cursor-text.png CVprivate_var.png CVglobal_var.png choice-round.png cursor-message-synchronous.png cursor-branch.png CVglobal_meth.png aggregation.png cursor-initial_state.png cursor-anchor.png entity.png cr22-action-umbrello_diagram_activity.png component.png CVprotected_slot.png cursor-actor.png cursor-component.png cr16-action-umbrello_diagram_usecase.png align_top.png andline.png cursor-class.png CVprivate_meth.png subsystem.png containment.png generalisation.png Makefile.in cursor-choice-rhomb.png CVimplementation_signal.png CVimplementation_slot.png node.png cursor-interface.png cr16-action-umbrello_diagram_component.png cr16-action-umbrello_diagram_sequence.png cr16-action-umbrello_diagram_state.png choice-rhomb.png cursor-object.png cursor-node.png cr22-action-umbrello_diagram_deployment.png association.png cursor-uniassociation.png cursor-generalisation.png cursor-note.png cr22-action-umbrello_diagram_sequence.png uniassociation.png CVimplementation_var.png cursor-aggregation.png align_vert_distribute.png cursor-message-asynchronous.png align_left.png cursor-relationship.png artifact.png cursor-state-fork.png startlogo.png cursor-andline.png cursor-datatype.png CVprotected_signal.png CVpublic_meth.png align_right.png join.png branch.png datatype.png cursor-package.png cursor-fork.png arrow.png note.png cr16-action-umbrello_diagram_deployment.png cursor-usecase.png package.png cursor-composition.png fork.png CVimplementation_meth.png cursor-containment.png deep-history.png cr22-action-umbrello_diagram_class.png cr16-action-umbrello_diagram_collaboration.png CVnamespace.png cursor-deep-history.png cursor-artifact.png message-asynchronous.png cr16-action-umbrello_diagram_activity.png enum.png align_hori_middle.png anchor.png cr22-action-umbrello_diagram_entityrelationship.png relationship.png CVpublic_slot.png shallow-history.png cursor-choice-round.png interface.png CVprivate_slot.png cursor-join.png state-fork.png cursor-dependency.png CVpublic_signal.png usecase.png text.png CVprotected_var.png align_bottom.png cursor-end_state.png cursor-junction.png class.png cursor-entity.png junction.png cr16-action-umbrello_diagram_class.png object.png cursor-association.png CVpublic_var.png cr22-action-umbrello_diagram_component.png CVstruct.png CVprotected_meth.png cursor-shallow-history.png end_state.png cursor-box.png align_hori_distribute.png cr22-action-umbrello_diagram_usecase.png cr22-action-umbrello_diagram_collaboration.png align_vert_middle.png message-synchronous.png composition.png initial_state.png box.png template.png Makefile.am 
  
- #>+ 2
- docs-am:
- 
- #>+ 40
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_collaboration.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_component.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_component.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_state.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_state.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_collaboration.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_activity.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_activity.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_component.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_component.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_sequence.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_sequence.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_usecase.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_usecase.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_entityrelationship.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_entityrelationship.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_component.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_component.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_class.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_entityrelationship.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_entityrelationship.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_state.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_state.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_deployment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_deployment.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_deployment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_deployment.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_usecase.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_usecase.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_activity.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_activity.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_sequence.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_sequence.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_component.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_component.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_collaboration.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_class.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_state.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_state.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_state.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_state.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_activity.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_activity.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_usecase.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_usecase.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_collaboration.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-umbrello_diagram_sequence.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_sequence.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_deployment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_deployment.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-umbrello_diagram_usecase.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_usecase.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_component.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_state.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_activity.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_component.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_sequence.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_usecase.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_entityrelationship.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_component.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_class.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_entityrelationship.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_state.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_deployment.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_deployment.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_usecase.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_activity.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_sequence.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_component.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_class.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_state.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_state.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_activity.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_usecase.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/umbrello_diagram_sequence.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_deployment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/umbrello_diagram_usecase.png
- 
- #>+ 15
- force-reedit:
---- umbrello/umbrello/refactoring/Makefile.in
-+++ umbrello/umbrello/refactoring/Makefile.in
+diff -ur kdesdk-3.5.5.old/umbrello/umbrello/refactoring/Makefile.in kdesdk-3.5.5/umbrello/umbrello/refactoring/Makefile.in
+--- kdesdk-3.5.5.old/umbrello/umbrello/refactoring/Makefile.in	2006-10-02 20:29:35.000000000 +0200
++++ kdesdk-3.5.5/umbrello/umbrello/refactoring/Makefile.in	2006-10-10 00:58:55.000000000 +0200
 @@ -124,6 +124,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -69556,20 +65824,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -172,6 +173,12 @@
- LIBTOOL = @LIBTOOL@
- LIBUCB = @LIBUCB@
- LIBUTIL = @LIBUTIL@
-+LIBXML_CFLAGS = @LIBXML_CFLAGS@
-+LIBXML_LIBS = @LIBXML_LIBS@
-+LIBXML_RPATH = @LIBXML_RPATH@
-+LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-+LIBXSLT_LIBS = @LIBXSLT_LIBS@
-+LIBXSLT_RPATH = @LIBXSLT_RPATH@
- LIBZ = @LIBZ@
- LIB_DBIV = @LIB_DBIV@
- LIB_KAB = @LIB_KAB@
-@@ -203,6 +210,9 @@
+@@ -209,6 +210,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69579,7 +65834,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -243,18 +253,16 @@
+@@ -249,18 +253,16 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -69599,7 +65854,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -275,14 +283,18 @@
+@@ -281,14 +283,18 @@
  cervisia_SUBDIR_included_FALSE = @cervisia_SUBDIR_included_FALSE@
  cervisia_SUBDIR_included_TRUE = @cervisia_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -69618,7 +65873,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_DBSEARCHENGINE_FALSE = @include_DBSEARCHENGINE_FALSE@
-@@ -349,14 +361,17 @@
+@@ -355,14 +361,17 @@
  kunittest_SUBDIR_included_TRUE = @kunittest_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -69636,7 +65891,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -390,7 +405,7 @@
+@@ -396,7 +405,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -69645,7 +65900,31 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -428,9 +443,9 @@
+@@ -405,9 +414,9 @@
+ #>- 	      exit 1;; \
+ #>- 	  esac; \
+ #>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/refactoring/Makefile'; \
++#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/refactoring/Makefile'; \
+ #>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  umbrello/umbrello/refactoring/Makefile
++#>- 	  $(AUTOMAKE) --gnu  umbrello/umbrello/refactoring/Makefile
+ #>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/refactoring/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/refactoring/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/refactoring/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/refactoring/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/refactoring/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+@@ -434,9 +443,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69657,3 +65936,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
+@@ -691,9 +700,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  umbrello/umbrello/refactoring/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  umbrello/umbrello/refactoring/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  umbrello/umbrello/refactoring/Makefile
++	  $(AUTOMAKE) --gnu  umbrello/umbrello/refactoring/Makefile
+ 	cd $(top_srcdir) && perl admin/am_edit umbrello/umbrello/refactoring/Makefile.in
+ 
+ 




More information about the pkg-kde-commits mailing list