--- digikam-0.9.4.orig/configure
+++ digikam-0.9.4/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62.
+# Generated by GNU Autoconf 2.61.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -15,7 +15,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37,45 +37,17 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Support unset when possible.
@@ -91,6 +63,8 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -113,7 +87,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -126,10 +100,17 @@
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -151,7 +132,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -177,7 +158,7 @@
   as_have_required=no
 fi
 
-  if test $as_have_required = yes &&	 (eval ":
+  if test $as_have_required = yes && 	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -259,7 +240,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -280,7 +261,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -360,10 +341,10 @@
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -432,10 +413,9 @@
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
+  echo Please tell autoconf@gnu.org about your system,
+  echo including any error possibly output before this
+  echo message
 }
 
 
@@ -471,7 +451,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -499,6 +479,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -511,22 +492,19 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
@@ -551,10 +529,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
-	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -854,7 +832,6 @@
 install_sh
 STRIP
 INSTALL_STRIP_PROGRAM
-MKDIR_P
 mkdir_p
 AWK
 SET_MAKE
@@ -1073,47 +1050,6 @@
 po_SUBDIR_included_TRUE
 po_SUBDIR_included_FALSE'
 ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_fast_perl
-enable_debug
-enable_dummyoption
-enable_strict
-enable_warnings
-enable_profile
-enable_dependency_tracking
-enable_pch
-enable_coverage
-enable_new_ldflags
-enable_final
-enable_closure
-enable_nmcheck
-enable_shared
-enable_static
-enable_libsuffix
-enable_fast_install
-with_gnu_ld
-enable_libtool_lock
-with_pic
-with_tags
-enable_pie
-enable_embedded
-enable_qtopia
-enable_mac
-enable_mt
-enable_threading
-with_extra_includes
-with_extra_libs
-with_qt_dir
-with_qt_includes
-with_qt_libraries
-enable_rpath
-enable_path_check
-with_arts
-enable_gcc_hidden_visibility
-with_included_sqlite3
-enable_nfs_hack
-'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -1136,8 +1072,6 @@
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1236,21 +1170,13 @@
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1263,21 +1189,13 @@
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1468,38 +1386,22 @@
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1519,7 +1421,7 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1528,16 +1430,16 @@
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1546,38 +1448,22 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+  { echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
+# Be sure to have absolute directory names.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1592,7 +1478,7 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1608,10 +1494,10 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+  { echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1619,12 +1505,12 @@
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+  ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1651,12 +1537,12 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1705,9 +1591,9 @@
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+			  [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1717,25 +1603,25 @@
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1757,7 +1643,6 @@
   cat <<\_ACEOF
 
 Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-fast-perl     disable fast Makefile generation (needs perl)
@@ -1843,17 +1728,15 @@
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1889,7 +1772,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1899,10 +1782,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.62
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1913,7 +1796,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -1949,7 +1832,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
+  echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1984,7 +1867,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -2036,12 +1919,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -2071,9 +1953,9 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -2088,9 +1970,9 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -2106,8 +1988,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2149,24 +2031,21 @@
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
+# Prefer explicitly selected file to automatically selected ones.
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  set x "$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+shift
+for ac_site_file
 do
-  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -2176,16 +2055,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -2199,38 +2078,29 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2240,10 +2110,10 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2287,8 +2157,8 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2306,34 +2176,34 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -2350,27 +2220,27 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2387,27 +2257,27 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
+{ echo "$as_me:$LINENO: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
 if test "${ac_cv_target+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -2435,10 +2305,13 @@
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
+# Double any \ or $.  echo might interpret backslashes.
 # By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm -f conftest.sed
 
 
 am__api_version='1.10'
@@ -2461,12 +2334,11 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2495,29 +2367,17 @@
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
+	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
 	  fi
 	fi
       done
     done
     ;;
 esac
-
 done
 IFS=$as_save_IFS
 
-rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2530,8 +2390,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2545,8 +2405,8 @@
   if test -z "$kde_save_INSTALL_given" ; then
     # OK, user hasn't given any INSTALL, autoconf found one for us
     # now we test, if it supports the -p flag
-    { $as_echo "$as_me:$LINENO: checking for -p flag to install" >&5
-$as_echo_n "checking for -p flag to install... " >&6; }
+    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
+echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
     rm -f confinst.$$.* > /dev/null 2>&1
     echo "Testtest" > confinst.$$.orig
     ac_res=no
@@ -2558,8 +2418,8 @@
       fi
     fi
     rm -f confinst.$$.*
-    { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+    { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
   fi
 
   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
@@ -2569,8 +2429,8 @@
     INSTALL_SCRIPT='${INSTALL}'
   fi
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -2593,9 +2453,9 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -2606,14 +2466,14 @@
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
+echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
@@ -2623,15 +2483,15 @@
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
 if test -z "$MKDIR_P"; then
   if test "${ac_cv_path_mkdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -2666,8 +2526,8 @@
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
@@ -2679,10 +2539,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2695,7 +2555,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2706,23 +2566,22 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2739,12 +2598,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2763,8 +2622,8 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -2819,10 +2678,10 @@
   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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2835,7 +2694,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2846,11 +2705,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -2859,10 +2718,10 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2875,7 +2734,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2886,11 +2745,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2898,10 +2757,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2945,15 +2804,15 @@
 
   if test "x$prefix" = "xNONE"; then
 
-   { $as_echo "$as_me:$LINENO: checking for kde-config" >&5
-$as_echo_n "checking for kde-config... " >&6; }
+   { echo "$as_me:$LINENO: checking for kde-config" >&5
+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
    if test -n "$KDECONFIG"; then
         kde_cv_path="$KDECONFIG";
    else
         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -2995,20 +2854,20 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program kde-config was not found!
+    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
 Please check whether you installed KDE correctly.
 " >&5
-$as_echo "$as_me: error: The important program kde-config was not found!
+echo "$as_me: error: The important program kde-config was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       KDECONFIG=$kde_cv_path
 
    fi
@@ -3017,15 +2876,15 @@
         kde_save_PATH="$PATH"
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
 
-   { $as_echo "$as_me:$LINENO: checking for kde-config" >&5
-$as_echo_n "checking for kde-config... " >&6; }
+   { echo "$as_me:$LINENO: checking for kde-config" >&5
+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
    if test -n "$KDECONFIG"; then
         kde_cv_path="$KDECONFIG";
    else
         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -3067,20 +2926,20 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program kde-config was not found!
+    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
 Please check whether you installed KDE correctly.
 " >&5
-$as_echo "$as_me: error: The important program kde-config was not found!
+echo "$as_me: error: The important program kde-config was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       KDECONFIG=$kde_cv_path
 
    fi
@@ -3090,11 +2949,11 @@
 
   kde_libs_prefix=`$KDECONFIG --prefix`
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-       { { $as_echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+       { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
                     This means it has been moved since you installed it.
                     This won't work. Please recompile kdelibs for the new prefix.
                     " >&5
-$as_echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
                     This means it has been moved since you installed it.
                     This won't work. Please recompile kdelibs for the new prefix.
                     " >&2;}
@@ -3102,16 +2961,16 @@
   fi
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
 
-  { $as_echo "$as_me:$LINENO: checking where to install" >&5
-$as_echo_n "checking where to install... " >&6; }
+  { echo "$as_me:$LINENO: checking where to install" >&5
+echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
   if test "x$prefix" = "xNONE"; then
     prefix=$kde_libs_prefix
-    { $as_echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
-$as_echo "$prefix (as returned by kde-config)" >&6; }
+    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
+echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
   else
         given_prefix=$prefix
-    { $as_echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
-$as_echo "$prefix (as requested)" >&6; }
+    { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
+echo "${ECHO_T}$prefix (as requested)" >&6; }
   fi
 
   # And delete superfluous '/' to make compares easier
@@ -3161,8 +3020,8 @@
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3189,8 +3048,8 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3296,10 +3155,10 @@
 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3312,7 +3171,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3323,11 +3182,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3336,10 +3195,10 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3352,7 +3211,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3363,11 +3222,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3375,10 +3234,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -3393,10 +3252,10 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3409,7 +3268,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3420,11 +3279,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3433,10 +3292,10 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3454,7 +3313,7 @@
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3477,11 +3336,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3492,10 +3351,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3508,7 +3367,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3519,11 +3378,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3536,10 +3395,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3552,7 +3411,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3563,11 +3422,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -3579,10 +3438,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -3594,48 +3453,44 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -3654,22 +3509,27 @@
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # 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.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -3680,11 +3540,10 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -3695,7 +3554,7 @@
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -3722,15 +3581,15 @@
   ac_file=''
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
 if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
+echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
@@ -3739,8 +3598,8 @@
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -3749,51 +3608,49 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
+echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3802,31 +3659,31 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3849,41 +3706,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3909,21 +3765,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3933,19 +3788,15 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3972,21 +3823,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -4011,21 +3861,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -4051,21 +3900,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4080,8 +3928,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -4097,10 +3945,10 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -4171,21 +4019,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4201,15 +4048,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -4221,10 +4068,10 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -4312,8 +4159,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -4333,15 +4180,15 @@
 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
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4373,21 +4220,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4411,14 +4257,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4426,7 +4271,7 @@
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4451,8 +4296,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4480,21 +4325,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4518,14 +4362,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4533,7 +4376,7 @@
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4549,9 +4392,9 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4605,10 +4448,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -4621,7 +4464,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4632,11 +4475,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -4649,10 +4492,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -4665,7 +4508,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4676,11 +4519,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -4692,10 +4535,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -4707,47 +4550,43 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4773,21 +4612,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -4797,19 +4635,15 @@
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -4836,21 +4670,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -4875,21 +4708,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -4915,21 +4747,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4944,8 +4775,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -4969,10 +4800,10 @@
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
 if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -5060,8 +4891,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
  if
@@ -5077,8 +4908,8 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
-$as_echo_n "checking whether $CC is blacklisted... " >&6; }
+  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
 
 
   cat >conftest.$ac_ext <<_ACEOF
@@ -5108,21 +4939,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   kde_bad_compiler=no
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_bad_compiler=yes
@@ -5131,11 +4961,11 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  { $as_echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
-$as_echo "$kde_bad_compiler" >&6; }
+  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+echo "${ECHO_T}$kde_bad_compiler" >&6; }
 
 if test "$kde_bad_compiler" = "yes"; then
-  { { $as_echo "$as_me:$LINENO: error:
+  { { echo "$as_me:$LINENO: error:
 
 This particular compiler version is blacklisted because it
 is known to miscompile KDE. Please use a newer version, or
@@ -5146,7 +4976,7 @@
 it by intention to avoid untraceable bugs or crashes in KDE.
 
 " >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
 
 This particular compiler version is blacklisted because it
 is known to miscompile KDE. Please use a newer version, or
@@ -5174,11 +5004,11 @@
         fi
       fi
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
-$as_echo_n "checking whether $CXX supports -fno-builtin... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
 kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5216,30 +5046,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5253,24 +5079,24 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="-fno-builtin $CXXFLAGS"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
-$as_echo_n "checking whether $CXX supports -Woverloaded-virtual... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
 kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5306,30 +5132,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5343,13 +5165,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
  WOVERLOADED_VRITUAL=""
 fi
@@ -5370,11 +5192,11 @@
 
   if test "$kde_use_profiling" = "yes"; then
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
-$as_echo_n "checking whether $CXX supports -pg... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
 kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5410,30 +5232,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5447,16 +5265,16 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
 
       CFLAGS="-pg $CFLAGS"
       CXXFLAGS="-pg $CXXFLAGS"
 
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -5471,11 +5289,11 @@
             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 -Wchar-subscripts $CXXFLAGS"
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
-$as_echo_n "checking whether $CXX supports -Wmissing-format-attribute... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
 kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5511,30 +5329,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5548,23 +5362,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
-$as_echo_n "checking whether $CC supports -Wmissing-format-attribute... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
 kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5597,30 +5411,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cc_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
@@ -5634,13 +5444,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -5648,11 +5458,11 @@
           ;;
         esac
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
-$as_echo_n "checking whether $CXX supports -Wundef... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
 kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5688,30 +5498,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5725,23 +5531,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="-Wundef $CXXFLAGS"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
-$as_echo_n "checking whether $CXX supports -Wno-long-long... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
 kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5777,30 +5583,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5814,23 +5616,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="-Wno-long-long $CXXFLAGS"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
-$as_echo_n "checking whether $CXX supports -Wno-non-virtual-dtor... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
 kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5866,30 +5668,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -5903,13 +5701,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -5935,11 +5733,11 @@
   if test "$GXX" = "yes"; then
     gcc_no_reorder_blocks=NO
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
-$as_echo_n "checking whether $CXX supports -fno-reorder-blocks... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
 kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -5975,30 +5773,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6012,13 +5806,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  gcc_no_reorder_blocks=YES
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -6030,11 +5824,11 @@
           CFLAGS="$CFLAGS -fno-reorder-blocks"
     fi
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
-$as_echo_n "checking whether $CXX supports -fno-exceptions... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
 kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6070,30 +5864,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6107,23 +5897,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -fno-exceptions"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
-$as_echo_n "checking whether $CXX supports -fno-check-new... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
 kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6159,30 +5949,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6196,23 +5982,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -fno-check-new"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
-$as_echo_n "checking whether $CXX supports -fno-common... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
 kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6248,30 +6034,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6285,23 +6067,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS -fno-common"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
-$as_echo_n "checking whether $CXX supports -fexceptions... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
 kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6337,30 +6119,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6374,13 +6152,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  USE_EXCEPTIONS="-fexceptions"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
  USE_EXCEPTIONS=
 fi
@@ -6388,39 +6166,39 @@
     ENABLE_PERMISSIVE_FLAG="-fpermissive"
 
     if test "$kde_use_pch" = "yes"; then
-        { $as_echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
-$as_echo_n "checking whether gcc supports precompiling c header files... " >&6; }
+        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
         echo >conftest.h
         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
             kde_gcc_supports_pch=yes
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
         else
             kde_gcc_supports_pch=no
-            { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
         fi
         if test "$kde_gcc_supports_pch" = "yes"; then
-            { $as_echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
-$as_echo_n "checking whether gcc supports precompiling c++ header files... " >&6; }
+            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
                 kde_gcc_supports_pch=yes
-                { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+                { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             else
                 kde_gcc_supports_pch=no
-                { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+                { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
             fi
         fi
         rm -f conftest.h conftest.h.gch
     fi
 
 
-  { $as_echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
-$as_echo_n "checking whether system headers can cope with -O2 -fno-inline... " >&6; }
+  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
 if test "${kde_cv_opt_noinline_match+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   kde_cv_opt_noinline_match=irrelevant
@@ -6455,31 +6233,27 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_opt_noinline_match=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_opt_noinline_match=no
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -6487,8 +6261,8 @@
   fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
-$as_echo "$kde_cv_opt_noinline_match" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
 
     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
@@ -6506,11 +6280,11 @@
 
     if test "$kde_use_pch" = "yes"; then
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
-$as_echo_n "checking whether $CXX supports --pch... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
 kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6546,30 +6320,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6583,24 +6353,24 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --pch"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
                                               fi
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
-$as_echo_n "checking whether $CXX supports --inline_keyword_space_time=6... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
 kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6636,30 +6406,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6673,23 +6439,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
-$as_echo_n "checking whether $CXX supports --inline_auto_space_time=2... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
 kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6725,30 +6491,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6762,23 +6524,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
-$as_echo_n "checking whether $CXX supports --inline_implicit_space_time=2.0... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
 kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6814,30 +6576,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6851,23 +6609,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
-$as_echo_n "checking whether $CXX supports --inline_generated_space_time=2.0... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
 kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6903,30 +6661,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -6940,23 +6694,23 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
-$as_echo_n "checking whether $CXX supports --one_per... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
 kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -6992,30 +6746,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7029,13 +6779,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="$CXXFLAGS --one_per"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -7053,8 +6803,8 @@
         if test "$GXX" = yes; then
           libstdcpp=`$CXX -print-file-name=libstdc++.so`
           if test ! -f $libstdcpp; then
-             { { $as_echo "$as_me:$LINENO: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&5
-$as_echo "$as_me: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&2;}
+             { { echo "$as_me:$LINENO: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&5
+echo "$as_me: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&2;}
    { (exit 1); exit 1; }; }
           fi
         fi
@@ -7070,8 +6820,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-$as_echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
+echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -7089,8 +6839,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-$as_echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
+echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -7109,8 +6859,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-$as_echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
+echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -7128,8 +6878,8 @@
     IFS=" 	"
     for i in $__val; do
       case "$__forbid" in
-        *" $i "*) { $as_echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-$as_echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
+        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
+echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
 	*) # Careful to not add spaces, where there were none, because otherwise
 	   # libtool gets confused, if we change e.g. CXX
 	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
@@ -7147,11 +6897,11 @@
 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
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -7183,21 +6933,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -7221,14 +6970,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -7236,7 +6984,7 @@
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -7261,8 +7009,8 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -7290,21 +7038,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -7328,14 +7075,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -7343,7 +7089,7 @@
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -7359,9 +7105,9 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7377,11 +7123,11 @@
      NOOPT_CFLAGS=-O0
   fi
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
-$as_echo_n "checking whether $CXX supports -O0... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
 kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -7417,30 +7163,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7454,13 +7196,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  NOOPT_CXXFLAGS=-O0
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -7476,8 +7218,8 @@
         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
         ac_coverage_linker=""
       else
-        { { $as_echo "$as_me:$LINENO: error: coverage with your compiler is not supported" >&5
-$as_echo "$as_me: error: coverage with your compiler is not supported" >&2;}
+        { { echo "$as_me:$LINENO: error: coverage with your compiler is not supported" >&5
+echo "$as_me: error: coverage with your compiler is not supported" >&2;}
    { (exit 1); exit 1; }; }
       fi
       CFLAGS="$CFLAGS $ac_coverage_compiler"
@@ -7505,11 +7247,11 @@
   if test "x$kde_use_new_ldflags" = "xyes"; then
        LDFLAGS_NEW_DTAGS=""
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
-$as_echo_n "checking whether $CXX supports -Wl,--enable-new-dtags... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
 kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -7545,30 +7287,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7582,24 +7320,24 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
-$as_echo_n "checking whether $CXX supports -Wl,--as-needed... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
 kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -7635,30 +7373,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7672,13 +7406,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -7727,11 +7461,11 @@
        case $host in
          *-*-linux-gnu)
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-$as_echo_n "checking whether $CXX supports -Wl,--no-undefined... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
+echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; }
 kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -7767,30 +7501,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7804,15 +7534,15 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-$as_echo_n "checking whether $CXX supports -Wl,--allow-shlib-undefined... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; }
 kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -7848,30 +7578,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -7885,20 +7611,20 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
  KDE_NO_UNDEFINED=""
 fi
 
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
  KDE_NO_UNDEFINED=""
 fi
@@ -8010,8 +7736,8 @@
        kdelibsuff=
     fi
     if test -z "$kdelibsuff"; then
-        { $as_echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
-$as_echo "not using lib directory suffix" >&6; }
+        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+echo "${ECHO_T}not using lib directory suffix" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define KDELIBSUFF ""
@@ -8027,8 +7753,8 @@
 #define KDELIBSUFF "${kdelibsuff}"
 _ACEOF
 
-        { $as_echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
-$as_echo "using lib directory suffix $kdelibsuff" >&6; }
+        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
     fi
 
 # Check whether --enable-fast-install was given.
@@ -8055,10 +7781,10 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -8109,40 +7835,45 @@
 fi
 
 SED=$lt_cv_path_SED
-{ $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
+{ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # Extract the first word of "grep ggrep" to use in msg output
+if test -z "$GREP"; then
+set dummy grep ggrep; ac_prog_name=$2
+if test "${ac_cv_path_GREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -z "$GREP"; then
   ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+    # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
+    echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -8157,60 +7888,74 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_GREP_found && break 3
-    done
+
+    $ac_path_GREP_found && break 3
   done
 done
+
+done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+fi
+
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-  fi
+fi
+
 else
   ac_cv_path_GREP=$GREP
 fi
 
+
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
+{ 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     if test -z "$EGREP"; then
+     # Extract the first word of "egrep" to use in msg output
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
   ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+    # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -8225,24 +7970,33 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_EGREP_found && break 3
-    done
+
+    $ac_path_EGREP_found && break 3
   done
 done
+
+done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+
+
+fi
+
+EGREP="$ac_cv_path_EGREP"
+if test -z "$EGREP"; then
+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-  fi
+fi
+
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
+
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
@@ -8257,8 +8011,8 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -8287,14 +8041,14 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -8324,19 +8078,19 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -8348,20 +8102,20 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -8369,10 +8123,10 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 
-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -8411,25 +8165,25 @@
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-$as_echo_n "checking how to recognise dependent libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -8633,8 +8387,8 @@
 esac
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -8662,7 +8416,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -8677,11 +8431,11 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8680 "configure"' > conftest.$ac_ext
+  echo '#line 8434 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -8718,7 +8472,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
@@ -8764,10 +8518,10 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8796,30 +8550,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   lt_cv_cc_needs_belf=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
@@ -8829,8 +8579,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -8843,10 +8593,10 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8873,21 +8623,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -8979,40 +8728,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -9034,11 +8780,11 @@
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9056,21 +8802,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -9078,14 +8823,12 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9096,21 +8839,20 @@
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+  { 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&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
@@ -9126,33 +8868,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&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
@@ -9166,72 +8907,69 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { 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:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9247,10 +8985,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&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_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
@@ -9263,7 +9001,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9274,11 +9012,11 @@
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  { $as_echo "$as_me:$LINENO: result: $F77" >&5
-$as_echo "$F77" >&6; }
+  { echo "$as_me:$LINENO: result: $F77" >&5
+echo "${ECHO_T}$F77" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -9291,10 +9029,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
@@ -9307,7 +9045,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9318,11 +9056,11 @@
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-$as_echo "$ac_ct_F77" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -9334,10 +9072,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -9348,41 +9086,37 @@
 
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 rm -f a.out
 
@@ -9390,10 +9124,10 @@
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
       program main
@@ -9409,21 +9143,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -9433,16 +9166,16 @@
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-$as_echo_n "checking whether $F77 accepts -g... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   FFLAGS=-g
 cat >conftest.$ac_ext <<_ACEOF
@@ -9456,21 +9189,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_prog_f77_g=no
@@ -9479,8 +9211,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-$as_echo "$ac_cv_prog_f77_g" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -9497,11 +9229,7 @@
   fi
 fi
 
-if test $ac_compiler_gnu = yes; then
-  G77=yes
-else
-  G77=
-fi
+G77=`test $ac_compiler_gnu = yes && echo yes`
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9513,10 +9241,10 @@
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     i=0
   testring="ABCD"
@@ -9572,21 +9300,21 @@
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
+  { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
 fi
 
 
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -9675,14 +9403,14 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -9737,7 +9465,7 @@
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -9772,17 +9500,17 @@
   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
-  { $as_echo "$as_me:$LINENO: result: failed" >&5
-$as_echo "failed" >&6; }
+  { echo "$as_me:$LINENO: result: failed" >&5
+echo "${ECHO_T}failed" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
+  { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -9794,8 +9522,8 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -9846,10 +9574,10 @@
 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -9862,7 +9590,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9873,11 +9601,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -9886,10 +9614,10 @@
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -9902,7 +9630,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9913,11 +9641,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -9925,10 +9653,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -9942,10 +9670,10 @@
 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -9958,7 +9686,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9969,11 +9697,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -9982,10 +9710,10 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -9998,7 +9726,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10009,11 +9737,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -10021,10 +9749,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -10038,10 +9766,10 @@
 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -10054,7 +9782,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10065,11 +9793,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -10078,10 +9806,10 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -10094,7 +9822,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10105,11 +9833,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -10117,10 +9845,10 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -10173,10 +9901,10 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -10226,19 +9954,19 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:$LINENO: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
+    { echo "$as_me:$LINENO: checking for file" >&5
+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -10288,11 +10016,11 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+echo "${ECHO_T}$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
   else
@@ -10367,12 +10095,12 @@
   esac
 fi
 if test -n "$lt_prog_cc_shlib"; then
-  { $as_echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-$as_echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
   if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
   else
-    { $as_echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-$as_echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
@@ -10381,10 +10109,10 @@
 #
 # Check to make sure the static flag actually works.
 #
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-$as_echo_n "checking if $compiler static flag $lt_prog_compiler_static works... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_static_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
@@ -10404,8 +10132,8 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-$as_echo "$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 
 if test x"$lt_prog_compiler_static_works" = xyes; then
     :
@@ -10426,10 +10154,10 @@
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -10444,11 +10172,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10447: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10175: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10451: \$? = $ac_status" >&5
+   echo "$as_me:10179: \$? = $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
@@ -10459,8 +10187,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -10474,8 +10202,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -10651,18 +10379,18 @@
     esac
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
@@ -10677,11 +10405,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10680: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10408: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10684: \$? = $ac_status" >&5
+   echo "$as_me:10412: \$? = $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
@@ -10692,8 +10420,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-$as_echo "$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -10716,10 +10444,10 @@
     ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
@@ -10744,11 +10472,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10747: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10475: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10751: \$? = $ac_status" >&5
+   echo "$as_me:10479: \$? = $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
@@ -10765,34 +10493,34 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -11092,21 +10820,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -11114,13 +10839,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11156,21 +10880,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -11178,13 +10899,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11607,8 +11327,8 @@
     esac
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+echo "${ECHO_T}$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -11633,15 +11353,15 @@
       # 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.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -11658,7 +11378,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -11670,16 +11390,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -12196,12 +11916,12 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var " || \
@@ -12225,8 +11945,8 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -12239,29 +11959,29 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+         { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
        else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
        ;;
    *)
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     ;;
   esac
 fi
@@ -12293,10 +12013,10 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -12328,36 +12048,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
@@ -12371,10 +12087,10 @@
    ;;
 
   *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
+    { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12427,42 +12143,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -12494,43 +12206,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12583,42 +12291,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -12650,43 +12354,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -12718,43 +12418,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -12786,36 +12482,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
@@ -12855,10 +12547,10 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -12866,7 +12558,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12869 "configure"
+#line 12561 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12930,7 +12622,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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=$?
@@ -12948,15 +12640,15 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -12964,7 +12656,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12967 "configure"
+#line 12659 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13028,7 +12720,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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=$?
@@ -13046,8 +12738,8 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -13069,13 +12761,13 @@
 
 
 # Report which librarie types wil actually be built
-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -13132,15 +12824,15 @@
   fi
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -13230,8 +12922,8 @@
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
+  { echo "$as_me:$LINENO: creating $ofile" >&5
+echo "$as_me: creating $ofile" >&6;}
 
   cat <<__EOF__ >> "$cfgfile"
 #! $SHELL
@@ -13627,18 +13319,18 @@
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
     else
-      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
 
@@ -13652,16 +13344,16 @@
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
+    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+echo "$as_me: error: invalid tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -13774,8 +13466,8 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -13804,14 +13496,14 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -13841,19 +13533,19 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -13865,8 +13557,8 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -13916,8 +13608,8 @@
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -14014,21 +13706,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -14036,13 +13725,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14079,21 +13767,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -14101,13 +13786,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14734,8 +14418,8 @@
     ld_shlibs_CXX=no
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -14759,7 +14443,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -14855,8 +14539,8 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -15107,18 +14791,18 @@
     esac
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
@@ -15133,11 +14817,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15136: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14820: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15140: \$? = $ac_status" >&5
+   echo "$as_me:14824: \$? = $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
@@ -15148,8 +14832,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -15172,10 +14856,10 @@
     ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
@@ -15200,11 +14884,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15203: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14887: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15207: \$? = $ac_status" >&5
+   echo "$as_me:14891: \$? = $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
@@ -15221,34 +14905,34 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -15272,8 +14956,8 @@
   ;;
   esac
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15298,15 +14982,15 @@
       # 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.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -15323,7 +15007,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -15335,16 +15019,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -15861,12 +15545,12 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var CXX" || \
@@ -15890,8 +15574,8 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -15904,29 +15588,29 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+         { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
        else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
        ;;
    *)
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     ;;
   esac
 fi
@@ -15958,10 +15642,10 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -15993,36 +15677,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
@@ -16036,10 +15716,10 @@
    ;;
 
   *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
+    { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16092,42 +15772,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -16159,43 +15835,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -16248,42 +15920,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -16315,43 +15983,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -16383,43 +16047,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -16451,36 +16111,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
@@ -16520,10 +16176,10 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -16531,7 +16187,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16534 "configure"
+#line 16190 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16595,7 +16251,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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=$?
@@ -16613,15 +16269,15 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -16629,7 +16285,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16632 "configure"
+#line 16288 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16693,7 +16349,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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=$?
@@ -16711,8 +16367,8 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -17207,13 +16863,13 @@
 compiler_F77=$CC
 cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 
-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -17230,15 +16886,15 @@
   test "$enable_shared" = yes && enable_static=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
+{ echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
 
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
@@ -17249,8 +16905,8 @@
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -17426,18 +17082,18 @@
     esac
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-$as_echo "$lt_prog_compiler_pic_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
@@ -17452,11 +17108,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17455: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17111: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17459: \$? = $ac_status" >&5
+   echo "$as_me:17115: \$? = $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
@@ -17467,8 +17123,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-$as_echo "$lt_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
@@ -17491,10 +17147,10 @@
     ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_prog_compiler_c_o_F77=no
    $rm -r conftest 2>/dev/null
@@ -17519,11 +17175,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17522: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17178: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17526: \$? = $ac_status" >&5
+   echo "$as_me:17182: \$? = $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
@@ -17540,34 +17196,34 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -17857,21 +17513,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -17879,13 +17532,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17911,21 +17563,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_f77_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -17933,13 +17582,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -18362,8 +18010,8 @@
     esac
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-$as_echo "$ld_shlibs_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -18388,15 +18036,15 @@
       # 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.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -18413,7 +18061,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_F77=no
@@ -18425,16 +18073,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-$as_echo "$archive_cmds_need_lc_F77" >&6; }
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -18951,12 +18599,12 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
    test -n "$runpath_var F77" || \
@@ -18980,8 +18628,8 @@
   # directories.
   hardcode_action_F77=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-$as_echo "$hardcode_action_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -18994,29 +18642,29 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+         { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
        else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
        ;;
    *)
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     ;;
   esac
 fi
@@ -19477,10 +19125,10 @@
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -19495,11 +19143,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19498: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19146: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19502: \$? = $ac_status" >&5
+   echo "$as_me:19150: \$? = $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
@@ -19510,8 +19158,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -19525,8 +19173,8 @@
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -19702,18 +19350,18 @@
     esac
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
@@ -19728,11 +19376,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19731: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19379: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19735: \$? = $ac_status" >&5
+   echo "$as_me:19383: \$? = $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
@@ -19743,8 +19391,8 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-$as_echo "$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
 
 if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
@@ -19767,10 +19415,10 @@
     ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_prog_compiler_c_o_GCJ=no
    $rm -r conftest 2>/dev/null
@@ -19795,11 +19443,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19798: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19446: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19802: \$? = $ac_status" >&5
+   echo "$as_me:19450: \$? = $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
@@ -19816,34 +19464,34 @@
    $rm conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
+  { echo "$as_me:$LINENO: result: $hard_links" >&5
+echo "${ECHO_T}$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -20143,21 +19791,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -20165,13 +19810,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -20207,21 +19851,18 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
@@ -20229,13 +19870,12 @@
 if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`; fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -20658,8 +20298,8 @@
     esac
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-$as_echo "$ld_shlibs_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -20684,15 +20324,15 @@
       # 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.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -20709,7 +20349,7 @@
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_GCJ=no
@@ -20721,16 +20361,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -21247,12 +20887,12 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
    test -n "$runpath_var GCJ" || \
@@ -21276,8 +20916,8 @@
   # directories.
   hardcode_action_GCJ=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-$as_echo "$hardcode_action_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
 
 if test "$hardcode_action_GCJ" = relink; then
   # Fast installation is not supported
@@ -21290,29 +20930,29 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+         { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
        else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
        ;;
    *)
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
     ;;
   esac
 fi
@@ -21344,10 +20984,10 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -21379,36 +21019,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
@@ -21422,10 +21058,10 @@
    ;;
 
   *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
+    { echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21478,42 +21114,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -21545,43 +21177,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen" >&5
+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21634,42 +21262,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -21701,43 +21325,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -21769,43 +21389,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_svld_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -21837,36 +21453,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_dld_link=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
@@ -21906,10 +21518,10 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -21917,7 +21529,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21920 "configure"
+#line 21532 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21981,7 +21593,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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=$?
@@ -21999,15 +21611,15 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -22015,7 +21627,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 22018 "configure"
+#line 21630 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -22079,7 +21691,7 @@
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  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=$?
@@ -22097,8 +21709,8 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -22965,8 +22577,8 @@
 	;;
 
       *)
-	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
       esac
@@ -22985,8 +22597,8 @@
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -23052,10 +22664,10 @@
 
     # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$MSGFMT" in
   /*)
@@ -23079,19 +22691,19 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
     # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
@@ -23106,7 +22718,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23119,18 +22731,18 @@
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 
      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        { $as_echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-$as_echo "found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
         GMSGFMT=":"
       fi
       MSGFMT=$GMSGFMT
@@ -23139,10 +22751,10 @@
 
       # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$XGETTEXT" in
   /*)
@@ -23166,11 +22778,11 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -23178,8 +22790,8 @@
 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
 	  : ;
 	else
-	  { $as_echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-$as_echo "found xgettext programs is not GNU xgettext; ignore it" >&6; }
+	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
 	  XGETTEXT=":"
 	fi
       fi
@@ -23266,10 +22878,10 @@
   if test -z "$PKG_CONFIG"; then
       # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -23284,7 +22896,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23297,11 +22909,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -23333,10 +22945,10 @@
     ac_save_CXXFLAGS="$CXXFLAGS"
     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
 
-    { $as_echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
-$as_echo_n "checking if C++ programs can be compiled... " >&6; }
+    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
     if test "${kde_cv_stl_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
@@ -23367,21 +22979,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   kde_cv_stl_works=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_stl_works=no
@@ -23392,8 +23003,8 @@
 fi
 
 
-   { $as_echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
-$as_echo "$kde_cv_stl_works" >&6; }
+   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
+echo "${ECHO_T}$kde_cv_stl_works" >&6; }
 
    if test "$kde_cv_stl_works" = "yes"; then
      # back compatible
@@ -23403,10 +23014,10 @@
 _ACEOF
 
    else
-	 { { $as_echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
+	 { { echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
 Check config.log for details - if you're using a Linux distribution you might miss
 a package named similar to libstdc++-dev." >&5
-$as_echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
+echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
 Check config.log for details - if you're using a Linux distribution you might miss
 a package named similar to libstdc++-dev." >&2;}
    { (exit 1); exit 1; }; }
@@ -23422,10 +23033,10 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for strlcat" >&5
-$as_echo_n "checking for strlcat... " >&6; }
+{ echo "$as_me:$LINENO: checking for strlcat" >&5
+echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
 if test "${kde_cv_func_strlcat+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -23474,21 +23085,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   kde_cv_func_strlcat=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_strlcat=no
@@ -23507,13 +23117,13 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
-$as_echo "$kde_cv_func_strlcat" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
-$as_echo_n "checking if strlcat needs custom prototype... " >&6; }
+{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
 if test "${kde_cv_proto_strlcat+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "x$kde_cv_func_strlcat" = xyes; then
@@ -23575,32 +23185,28 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_strlcat=yes
   kde_cv_proto_strlcat=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_strlcat="strlcat unavailable"
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -23614,8 +23220,8 @@
 
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
-$as_echo "$kde_cv_proto_strlcat" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
 
 if test "x$kde_cv_func_strlcat" = xyes; then
 
@@ -23639,10 +23245,10 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for strlcpy" >&5
-$as_echo_n "checking for strlcpy... " >&6; }
+{ echo "$as_me:$LINENO: checking for strlcpy" >&5
+echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
 if test "${kde_cv_func_strlcpy+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -23690,21 +23296,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   kde_cv_func_strlcpy=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_strlcpy=no
@@ -23723,13 +23328,13 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
-$as_echo "$kde_cv_func_strlcpy" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
-$as_echo_n "checking if strlcpy needs custom prototype... " >&6; }
+{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
 if test "${kde_cv_proto_strlcpy+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "x$kde_cv_func_strlcpy" = xyes; then
@@ -23790,32 +23395,28 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_strlcpy=yes
   kde_cv_proto_strlcpy=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_strlcpy="strlcpy unavailable"
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -23829,8 +23430,8 @@
 
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
-$as_echo "$kde_cv_proto_strlcpy" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
 
 if test "x$kde_cv_func_strlcpy" = xyes; then
 
@@ -23853,10 +23454,10 @@
 
 
 
-      { $as_echo "$as_me:$LINENO: checking for main in -lutil" >&5
-$as_echo_n "checking for main in -lutil... " >&6; }
+      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
+echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
 if test "${ac_cv_lib_util_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
@@ -23882,44 +23483,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_util_main=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_util_main=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-$as_echo "$ac_cv_lib_util_main" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
 if test $ac_cv_lib_util_main = yes; then
   LIBUTIL="-lutil"
 fi
 
-   { $as_echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-$as_echo_n "checking for main in -lcompat... " >&6; }
+   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
 if test "${ac_cv_lib_compat_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcompat  $LIBS"
@@ -23945,45 +23542,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_compat_main=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_compat_main=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-$as_echo "$ac_cv_lib_compat_main" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
 if test $ac_cv_lib_compat_main = yes; then
   LIBCOMPAT="-lcompat"
 fi
 
    kde_have_crypt=
-   { $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
@@ -24015,43 +23608,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_crypt_crypt=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_crypt_crypt=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
 if test $ac_cv_lib_crypt_crypt = yes; then
   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
 else
-  { $as_echo "$as_me:$LINENO: checking for crypt in -lc" >&5
-$as_echo_n "checking for crypt in -lc... " >&6; }
+  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
 if test "${ac_cv_lib_c_crypt+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
@@ -24083,44 +23672,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_c_crypt=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_c_crypt=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-$as_echo "$ac_cv_lib_c_crypt" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
 if test $ac_cv_lib_c_crypt = yes; then
   kde_have_crypt=yes
 else
 
-        { $as_echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
+        { echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
 You should install libcrypt from another source or configure with PAM
 support" >&5
-$as_echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
+echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
 You should install libcrypt from another source or configure with PAM
 support" >&2;}
 	kde_have_crypt=no
@@ -24138,10 +23723,10 @@
 
    fi
 
-   { $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
-$as_echo_n "checking for socklen_t... " >&6; }
+   { echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
    if test "${kde_cv_socklen_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       ac_ext=cpp
@@ -24178,14 +23763,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -24195,7 +23779,7 @@
          kde_cv_socklen_t_equiv=socklen_t
 
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -24211,13 +23795,13 @@
 
 fi
 
-   { $as_echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
-$as_echo "$kde_cv_socklen_t" >&6; }
+   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
    if test $kde_cv_socklen_t = no; then
-      { $as_echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
-$as_echo_n "checking for socklen_t equivalent for socket functions... " >&6; }
+      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
       if test "${kde_cv_socklen_t_equiv+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
          kde_cv_socklen_t_equiv=int
@@ -24255,14 +23839,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
@@ -24272,7 +23855,7 @@
                break
 
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -24289,8 +23872,8 @@
 
 fi
 
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
-$as_echo "$kde_cv_socklen_t_equiv" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
    fi
 
 cat >>confdefs.h <<_ACEOF
@@ -24303,10 +23886,10 @@
 _ACEOF
 
 
-   { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
@@ -24338,45 +23921,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_dnet_ntoa=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
@@ -24408,45 +23987,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
    fi
-   { $as_echo "$as_me:$LINENO: checking for inet_ntoa" >&5
-$as_echo_n "checking for inet_ntoa... " >&6; }
+   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
 if test "${ac_cv_func_inet_ntoa+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24499,41 +24074,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_inet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_inet_ntoa=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
-$as_echo "$ac_cv_func_inet_ntoa" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
 
    if test $ac_cv_func_inet_ntoa = no; then
-     { $as_echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
-$as_echo_n "checking for inet_ntoa in -lnsl... " >&6; }
+     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
@@ -24565,45 +24136,41 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_nsl_inet_ntoa=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-$as_echo "$ac_cv_lib_nsl_inet_ntoa" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
 if test $ac_cv_lib_nsl_inet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
    fi
-   { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
+   { echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24656,41 +24223,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_connect=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_connect=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
 
    if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
@@ -24722,46 +24285,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_socket_connect=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_socket_connect=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
    fi
 
-   { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
+   { echo "$as_me:$LINENO: checking for remove" >&5
+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
 if test "${ac_cv_func_remove+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24814,41 +24373,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_remove=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_remove=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
 
    if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
 if test "${ac_cv_lib_posix_remove+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
@@ -24880,36 +24435,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_posix_remove=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_posix_remove=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
@@ -24917,10 +24468,10 @@
    fi
 
    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
+   { echo "$as_me:$LINENO: checking for shmat" >&5
+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
 if test "${ac_cv_func_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24973,42 +24524,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func_shmat=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shmat=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
 if test $ac_cv_func_shmat = yes; then
   :
 else
-  { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
+  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
@@ -25040,36 +24587,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ipc_shmat=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ipc_shmat=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
@@ -25082,21 +24625,20 @@
 
 for ac_header in sys/types.h stdint.h
 do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+  { 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&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
@@ -25112,33 +24654,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&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
@@ -25152,72 +24693,69 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { 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:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -25229,21 +24767,20 @@
 
 for ac_header in sys/bitypes.h
 do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+  { 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&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
@@ -25259,33 +24796,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&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
@@ -25299,72 +24835,69 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { 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:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -25373,10 +24906,10 @@
 
 
    # darwin requires a poll emulation library
-   { $as_echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
-$as_echo_n "checking for poll in -lpoll... " >&6; }
+   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
 if test "${ac_cv_lib_poll_poll+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpoll  $LIBS"
@@ -25408,36 +24941,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_poll_poll=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_poll_poll=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-$as_echo "$ac_cv_lib_poll_poll" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
 if test $ac_cv_lib_poll_poll = yes; then
   LIB_POLL="-lpoll"
 fi
@@ -25447,21 +24976,20 @@
 
 for ac_header in Carbon/Carbon.h
 do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+  { 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&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
@@ -25477,33 +25005,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&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
@@ -25517,72 +25044,69 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { 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:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -25592,17 +25116,17 @@
 
    # CoreAudio framework
    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
+  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-$as_echo_n "checking CoreAudio/CoreAudio.h usability... " >&6; }
+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25618,33 +25142,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-$as_echo_n "checking CoreAudio/CoreAudio.h presence... " >&6; }
+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25658,64 +25181,63 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
+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;}
 
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
+{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 
 fi
 if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
@@ -25732,8 +25254,8 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-$as_echo_n "checking if res_init needs -lresolv... " >&6; }
+  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
   kde_libs_safe="$LIBS"
   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
   cat >conftest.$ac_ext <<_ACEOF
@@ -25764,25 +25286,22 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
       LIBRESOLV="-lresolv"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+      { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_RES_INIT 1
@@ -25790,25 +25309,24 @@
 
 
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$kde_libs_safe
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for res_init" >&5
-$as_echo_n "checking for res_init... " >&6; }
+{ echo "$as_me:$LINENO: checking for res_init" >&5
+echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
 if test "${kde_cv_func_res_init+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -25857,21 +25375,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   kde_cv_func_res_init=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_func_res_init=no
@@ -25890,13 +25407,13 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
-$as_echo "$kde_cv_func_res_init" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
-$as_echo_n "checking if res_init needs custom prototype... " >&6; }
+{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
 if test "${kde_cv_proto_res_init+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test "x$kde_cv_func_res_init" = xyes; then
@@ -25958,32 +25475,28 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
    kde_cv_func_res_init=yes
   kde_cv_proto_res_init=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_proto_res_init="res_init unavailable"
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$kde_safe_libs
@@ -25997,8 +25510,8 @@
 
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
-$as_echo "$kde_cv_proto_res_init" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
 
 if test "x$kde_cv_func_res_init" = xyes; then
 
@@ -26025,10 +25538,10 @@
    LIBSOCKET="$X_EXTRA_LIBS"
 
 
-   { $as_echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
-$as_echo_n "checking for killpg in -lucb... " >&6; }
+   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lucb  $LIBS"
@@ -26060,51 +25573,47 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ucb_killpg=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ucb_killpg=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-$as_echo "$ac_cv_lib_ucb_killpg" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
 if test $ac_cv_lib_ucb_killpg = yes; then
   LIBUCB="-lucb"
 fi
 
 
    case $host in     *-*-lynxos* )
-        { $as_echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
-$as_echo_n "checking LynxOS header file wrappers... " >&6; }
+        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
-        { $as_echo "$as_me:$LINENO: result: disabled" >&5
-$as_echo "disabled" >&6; }
-        { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+        { echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6; }
+        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
@@ -26136,50 +25645,100 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_bsd_gethostbyname=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   LIBSOCKET="-lbsd"
 fi
           ;;
     esac
 
-     # The cast to long int works around a bug in the HP C Compiler
+     { echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+if test "${ac_cv_type_int+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef int ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_int=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_int=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+echo "${ECHO_T}$ac_cv_type_int" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -26190,10 +25749,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -26206,14 +25766,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -26227,10 +25786,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -26243,21 +25803,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -26271,7 +25830,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -26281,10 +25840,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -26297,14 +25857,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -26318,10 +25877,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -26334,21 +25894,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -26362,7 +25921,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -26382,10 +25941,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -26398,21 +25958,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -26423,9 +25982,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
 '') if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -26440,8 +25999,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (int)); }
-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
+   typedef int ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -26451,22 +26011,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (int))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (int))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (int))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -26479,46 +26037,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
 
 
 
@@ -26526,14 +26081,68 @@
 #define SIZEOF_INT $ac_cv_sizeof_int
 _ACEOF
 
-   # The cast to long int works around a bug in the HP C Compiler
+   { echo "$as_me:$LINENO: checking for short" >&5
+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+if test "${ac_cv_type_short+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef short ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_short=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_short=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+echo "${ECHO_T}$ac_cv_type_short" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_short+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -26544,10 +26153,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -26560,14 +26170,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -26581,10 +26190,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -26597,21 +26207,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -26625,7 +26234,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -26635,10 +26244,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -26651,14 +26261,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -26672,10 +26281,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -26688,21 +26298,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -26716,7 +26325,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -26736,10 +26345,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -26752,21 +26362,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -26777,9 +26386,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
 '') if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
+echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -26794,8 +26403,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (short)); }
-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
+   typedef short ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -26805,22 +26415,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (short))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (short))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (short))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -26833,46 +26441,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
+echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_short=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
 
 
 
@@ -26880,14 +26485,68 @@
 #define SIZEOF_SHORT $ac_cv_sizeof_short
 _ACEOF
 
-  # The cast to long int works around a bug in the HP C Compiler
+  { echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+if test "${ac_cv_type_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef long ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_long=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -26898,10 +26557,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -26914,14 +26574,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -26935,10 +26594,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -26951,21 +26611,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -26979,7 +26638,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -26989,10 +26648,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -27005,14 +26665,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -27026,10 +26685,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27042,21 +26702,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -27070,7 +26729,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -27090,10 +26749,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27106,21 +26766,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -27131,9 +26790,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -27148,8 +26807,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
+   typedef long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -27159,22 +26819,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (long))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (long))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (long))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -27187,46 +26845,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
 
 
 
@@ -27234,14 +26889,68 @@
 #define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
-  # The cast to long int works around a bug in the HP C Compiler
+  { echo "$as_me:$LINENO: checking for char *" >&5
+echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+if test "${ac_cv_type_char_p+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef char * ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_char_p=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_char_p=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of char *" >&5
-$as_echo_n "checking size of char *... " >&6; }
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_char_p+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -27252,10 +26961,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -27268,14 +26978,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -27289,10 +26998,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27305,21 +27015,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -27333,7 +27042,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -27343,10 +27052,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -27359,14 +27069,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -27380,10 +27089,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27396,21 +27106,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -27424,7 +27133,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -27444,10 +27153,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27460,21 +27170,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -27485,9 +27194,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_char_p=$ac_lo;;
 '') if test "$ac_cv_type_char_p" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char *)
+echo "$as_me: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -27502,8 +27211,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (char *)); }
-static unsigned long int ulongval () { return (long int) (sizeof (char *)); }
+   typedef char * ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -27513,22 +27223,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (char *))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (char *))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (char *))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -27541,46 +27249,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_char_p=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_char_p" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char *)
+echo "$as_me: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_char_p=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-$as_echo "$ac_cv_sizeof_char_p" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
 
 
 
@@ -27590,10 +27295,10 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -27625,36 +27330,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
 
 LIBDL="-ldl"
@@ -27663,10 +27364,10 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
-$as_echo_n "checking for shl_unload in -ldld... " >&6; }
+{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -27698,36 +27399,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_dld_shl_unload=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_unload=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
-$as_echo "$ac_cv_lib_dld_shl_unload" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
 if test $ac_cv_lib_dld_shl_unload = yes; then
 
 LIBDL="-ldld"
@@ -27741,14 +27438,68 @@
 
 
 
-  # The cast to long int works around a bug in the HP C Compiler
+  { echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_size_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef size_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_size_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_size_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
+{ echo "$as_me:$LINENO: checking size of size_t" >&5
+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_size_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -27759,10 +27510,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -27775,14 +27527,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -27796,10 +27547,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27812,21 +27564,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -27840,7 +27591,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -27850,10 +27601,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -27866,14 +27618,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -27887,10 +27638,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27903,21 +27655,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -27931,7 +27682,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -27951,10 +27702,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef size_t ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -27967,21 +27719,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -27992,9 +27743,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_size_t=$ac_lo;;
 '') if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+echo "$as_me: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -28009,8 +27760,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (size_t)); }
-static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
+   typedef size_t ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -28020,22 +27772,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (size_t))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (size_t))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (size_t))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -28048,46 +27798,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_size_t" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+echo "$as_me: error: cannot compute sizeof (size_t)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_size_t=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
 
 
 
@@ -28096,14 +27843,68 @@
 _ACEOF
 
 
-  # The cast to long int works around a bug in the HP C Compiler
+  { echo "$as_me:$LINENO: checking for unsigned long" >&5
+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+if test "${ac_cv_type_unsigned_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef unsigned long ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_unsigned_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_unsigned_long=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5
-$as_echo_n "checking size of unsigned long... " >&6; }
+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -28114,10 +27915,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -28130,14 +27932,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -28151,10 +27952,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -28167,21 +27969,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -28195,7 +27996,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -28205,10 +28006,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -28221,14 +28023,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -28242,10 +28043,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -28258,21 +28060,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -28286,7 +28087,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -28306,10 +28107,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef unsigned long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -28322,21 +28124,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -28347,9 +28148,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
 '') if test "$ac_cv_type_unsigned_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
+echo "$as_me: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -28364,8 +28165,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (unsigned long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); }
+   typedef unsigned long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -28375,22 +28177,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (unsigned long))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (unsigned long))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (unsigned long))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -28403,46 +28203,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_unsigned_long=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_unsigned_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
+echo "$as_me: error: cannot compute sizeof (unsigned long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_unsigned_long=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
 
 
 
@@ -28452,8 +28249,8 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
-$as_echo_n "checking sizeof size_t == sizeof unsigned long... " >&6; }
+  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28479,32 +28276,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-      { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-      { { $as_echo "$as_me:$LINENO: error:
+      { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+      { { echo "$as_me:$LINENO: error:
        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
        does not apply. Please mail kde-devel@kde.org with a description of your system!
       " >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
        does not apply. Please mail kde-devel@kde.org with a description of your system!
       " >&2;}
@@ -28515,10 +28311,10 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-  { $as_echo "$as_me:$LINENO: checking for PIE support" >&5
-$as_echo_n "checking for PIE support... " >&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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -28557,30 +28353,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_val_pie_support=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_val_pie_support=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -28594,11 +28386,11 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
-$as_echo "$kde_cv_val_pie_support" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
 
-  { $as_echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
-$as_echo_n "checking if enabling -pie/fPIE support... " >&6; }
+  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
 
   # Check whether --enable-pie was given.
 if test "${enable_pie+set}" = set; then
@@ -28612,8 +28404,8 @@
     kde_has_pie_support=$kde_cv_val_pie_support
   fi
 
-  { $as_echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
-$as_echo "$kde_has_pie_support" >&6; }
+  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+echo "${ECHO_T}$kde_has_pie_support" >&6; }
 
   KDE_USE_FPIE=""
   KDE_USE_PIE=""
@@ -28631,21 +28423,20 @@
 
 for ac_header in crt_externs.h
 do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+  { 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&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
@@ -28661,33 +28452,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&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
@@ -28701,82 +28491,79 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { 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:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { 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
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
+{ 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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
 
 fi
-if test `eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'` = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ $as_echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
-$as_echo_n "checking for _NSGetEnviron... " >&6; }
+{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
 if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28829,35 +28616,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_func__NSGetEnviron=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func__NSGetEnviron=no
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
-$as_echo "$ac_cv_func__NSGetEnviron" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
 if test $ac_cv_func__NSGetEnviron = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -28877,11 +28660,11 @@
 
 for ac_func in vsnprintf snprintf
 do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
+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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28934,41 +28717,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_var=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'` = yes; then
+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 `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29021,11 +28798,11 @@
 
 if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
 
-{ $as_echo "$as_me:$LINENO: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
+{ echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
 
 if test "${kde_cv_have_x+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
@@ -29064,14 +28841,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -29079,7 +28855,7 @@
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Look for the header file in a standard set of common directories.
@@ -29161,26 +28937,23 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	LIBS="$ac_save_LIBS"
@@ -29232,7 +29005,6 @@
 done
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = NO
@@ -29260,7 +29032,7 @@
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
+    for ac_extension in a so sl; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
@@ -29303,14 +29075,14 @@
 fi
 
 if test "$kde_x_includes" = NO; then
-  { { $as_echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
-$as_echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
+  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
+echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test "$kde_x_libraries" = NO; then
-  { { $as_echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
-$as_echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
+  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
+echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -29323,12 +29095,12 @@
 eval "$kde_cv_have_x"
 
 if test "$have_x" != yes; then
-  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
+  { echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6; }
   no_x=yes
 else
-  { $as_echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-$as_echo "libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
 fi
 
 if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
@@ -29356,10 +29128,10 @@
 # These have to be linked with before -lX11, unlike the other
 # libraries we check for below, so use a different variable.
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-{ $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
@@ -29391,36 +29163,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   LIBSM="-lSM -lICE"
 fi
@@ -29429,10 +29197,10 @@
 
 LIB_X11='-lX11 $(LIBSOCKET)'
 
-{ $as_echo "$as_me:$LINENO: checking for libXext" >&5
-$as_echo_n "checking for libXext... " >&6; }
+{ echo "$as_me:$LINENO: checking for libXext" >&5
+echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
 if test "${kde_cv_have_libXext+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 kde_ldflags_safe="$LDFLAGS"
@@ -29469,31 +29237,27 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_have_libXext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_have_libXext=no
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -29503,14 +29267,14 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-$as_echo "$kde_cv_have_libXext" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
 
 if test "$kde_cv_have_libXext" = "no"; then
-  { { $as_echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
 can't find it itself, we stop here assuming that make wouldn't find
 them either." >&5
-$as_echo "$as_me: error: We need a working libXext to proceed. Since configure
+echo "$as_me: error: We need a working libXext to proceed. Since configure
 can't find it itself, we stop here assuming that make wouldn't find
 them either." >&2;}
    { (exit 1); exit 1; }; }
@@ -29566,8 +29330,8 @@
     else
       PTHREAD_LIBS_save="$PTHREAD_LIBS"
       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-      { $as_echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
-$as_echo_n "checking for pthread_create in $PTHREAD_LIBS... " >&6; }
+      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
 
      kde_save_LDFLAGS="$LDFLAGS"
           kde_save_LIBS="$LIBS"
@@ -29577,11 +29341,11 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     as_ac_Lib=`$as_echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-$as_echo_n "checking for pthread_create in -l$PTHREAD_LIBS... " >&6; }
+     as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PTHREAD_LIBS  $LIBS"
@@ -29613,40 +29377,34 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "$as_ac_Lib=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -rf conftest.dSYM
 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
-ac_res=`eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_Lib'}
-		 $as_echo "$as_val"'` = yes; then
+ac_res=`eval echo '${'$as_ac_Lib'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   LIBPTHREAD="$PTHREAD_LIBS_save"
 fi
 
@@ -29658,10 +29416,10 @@
   fi
 
     if test -z "$LIBPTHREAD"; then
-    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
@@ -29693,36 +29451,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_pthread_pthread_create=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
 if test $ac_cv_lib_pthread_pthread_create = yes; then
   LIBPTHREAD="-lpthread"
 fi
@@ -29730,8 +29484,8 @@
   fi
 
     if test -z "$LIBPTHREAD" ; then
-    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
     kde_safe_libs=$LIBS
     LIBS="$LIBS -lpthread"
     cat >conftest.$ac_ext <<_ACEOF
@@ -29755,35 +29509,31 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
 
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
         LIBPTHREAD="-lpthread"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS=$kde_safe_libs
@@ -29799,11 +29549,11 @@
       USE_THREADS=""
       if test -z "$LIBPTHREAD"; then
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
-$as_echo_n "checking whether $CXX supports -pthread... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
 kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -29839,30 +29589,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -29876,13 +29622,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  USE_THREADS="-D_THREAD_SAFE -pthread"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -29894,11 +29640,11 @@
     case $host_os in
  	solaris*)
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
-$as_echo_n "checking whether $CXX supports -mt... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
 kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -29934,30 +29680,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -29971,13 +29713,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  USE_THREADS="-mt"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -30004,8 +29746,8 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for extra includes" >&5
-$as_echo_n "checking for extra includes... " >&6; }
+{ echo "$as_me:$LINENO: checking for extra includes" >&5
+echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
 
 # Check whether --with-extra-includes was given.
 if test "${with_extra_includes+set}" = set; then
@@ -30032,12 +29774,12 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
-$as_echo "$kde_use_extra_includes" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+echo "${ECHO_T}$kde_use_extra_includes" >&6; }
 
 kde_extra_libs=
-{ $as_echo "$as_me:$LINENO: checking for extra libs" >&5
-$as_echo_n "checking for extra libs... " >&6; }
+{ echo "$as_me:$LINENO: checking for extra libs" >&5
+echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
 
 # Check whether --with-extra-libs was given.
 if test "${with_extra_libs+set}" = set; then
@@ -30065,16 +29807,16 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
-$as_echo "$kde_use_extra_libs" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+echo "${ECHO_T}$kde_use_extra_libs" >&6; }
 
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for libz" >&5
-$as_echo_n "checking for libz... " >&6; }
+{ echo "$as_me:$LINENO: checking for libz" >&5
+echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
 if test "${ac_cv_lib_z+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 kde_save_LIBS="$LIBS"
@@ -30112,30 +29854,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_z='-lz'"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_z=no"
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -30149,15 +29887,15 @@
 _ACEOF
 
   LIBZ="$ac_cv_lib_z"
-  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-$as_echo "$ac_cv_lib_z" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+echo "${ECHO_T}$ac_cv_lib_z" >&6; }
 else
-  { { $as_echo "$as_me:$LINENO: error: not found.
+  { { echo "$as_me:$LINENO: error: not found.
           Possibly configure picks up an outdated version
           installed by XFree86. Remove it from your system.
 
           Check your installation and look into config.log" >&5
-$as_echo "$as_me: error: not found.
+echo "$as_me: error: not found.
           Possibly configure picks up an outdated version
           installed by XFree86. Remove it from your system.
 
@@ -30170,10 +29908,10 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for libpng" >&5
-$as_echo_n "checking for libpng... " >&6; }
+{ echo "$as_me:$LINENO: checking for libpng" >&5
+echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 kde_save_LIBS="$LIBS"
@@ -30212,31 +29950,27 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_png=no"
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$kde_save_LIBS"
@@ -30251,21 +29985,21 @@
 
   LIBPNG="$ac_cv_lib_png"
 
-  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-$as_echo "$ac_cv_lib_png" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+echo "${ECHO_T}$ac_cv_lib_png" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   LIBPNG=""
 
 fi
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-$as_echo_n "checking for libjpeg6b... " >&6; }
+{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
 if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 ac_save_LIBS="$LIBS"
@@ -30301,30 +30035,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_jpeg_6b=no"
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -30335,16 +30065,16 @@
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_6b"
-  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-$as_echo "$ac_cv_lib_jpeg_6b" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for libjpeg" >&5
-$as_echo_n "checking for libjpeg... " >&6; }
+{ echo "$as_me:$LINENO: checking for libjpeg" >&5
+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
 if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 ac_save_LIBS="$LIBS"
@@ -30380,30 +30110,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "ac_cv_lib_jpeg_normal=-ljpeg"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "ac_cv_lib_jpeg_normal=no"
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -30414,11 +30140,11 @@
 
 if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
   LIBJPEG="$ac_cv_lib_jpeg_normal"
-  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-$as_echo "$ac_cv_lib_jpeg_normal" >&6; }
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
        LIBJPEG=
 
@@ -30438,7 +30164,7 @@
 do
   for j in jpeglib.h;
   do
-    echo "configure: 30441: $i/$j" >&5
+    echo "configure: 30167: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       jpeg_incdir=$i
@@ -30457,14 +30183,14 @@
 
 else
   if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    { $as_echo "$as_me:$LINENO: WARNING:
+    { echo "$as_me:$LINENO: WARNING:
 There is an installation error in jpeg support. You seem to have only one
 of either the headers _or_ the libraries installed. You may need to either
 provide correct --with-extra-... options, or the development package of
 libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
 Disabling JPEG support.
 " >&5
-$as_echo "$as_me: WARNING:
+echo "$as_me: WARNING:
 There is an installation error in jpeg support. You seem to have only one
 of either the headers _or_ the libraries installed. You may need to either
 provide correct --with-extra-... options, or the development package of
@@ -30472,8 +30198,8 @@
 Disabling JPEG support.
 " >&2;}
   else
-    { $as_echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-$as_echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
+    { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
+echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
   fi
   jpeg_incdir=
   LIBJPEG=
@@ -30485,15 +30211,15 @@
 
 
 
-   { $as_echo "$as_me:$LINENO: checking for perl" >&5
-$as_echo_n "checking for perl... " >&6; }
+   { echo "$as_me:$LINENO: checking for perl" >&5
+echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
    if test -n "$PERL"; then
         kde_cv_path="$PERL";
    else
         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -30535,18 +30261,18 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-		    { { $as_echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
 We need perl to generate some code." >&5
-$as_echo "$as_me: error: No Perl found in your $PATH.
+echo "$as_me: error: No Perl found in your $PATH.
 We need perl to generate some code." >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       PERL=$kde_cv_path
 
    fi
@@ -30671,8 +30397,8 @@
   LIBQT="$LIBQT $LIBDL"
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for Qt" >&5
-$as_echo_n "checking for Qt... " >&6; }
+{ echo "$as_me:$LINENO: checking for Qt" >&5
+echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
 
 if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
 LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
@@ -30711,7 +30437,7 @@
 
 
 if test "${ac_cv_have_qt+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   #try to guess Qt locations
 
@@ -30722,10 +30448,10 @@
 if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -30740,7 +30466,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -30753,11 +30479,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -30784,7 +30510,7 @@
 do
   for j in $kde_qt_header;
   do
-    echo "configure: 30787: $i/$j" >&5
+    echo "configure: 30513: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       qt_incdir=$i
@@ -30802,10 +30528,10 @@
 if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -30820,7 +30546,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -30833,11 +30559,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -30952,7 +30678,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
   rm -f conftest*
 else
@@ -30991,9 +30717,9 @@
     fi
   fi
 
-  { { $as_echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
+  { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
 For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5
-$as_echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
+echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
 For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -31006,13 +30732,13 @@
 eval "$ac_cv_have_qt"
 
 if test "$have_qt" != yes; then
-  { $as_echo "$as_me:$LINENO: result: $have_qt" >&5
-$as_echo "$have_qt" >&6; };
+  { echo "$as_me:$LINENO: result: $have_qt" >&5
+echo "${ECHO_T}$have_qt" >&6; };
 else
   ac_cv_have_qt="have_qt=yes \
     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-  { $as_echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
-$as_echo "libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
+  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
 
   qt_libraries="$ac_qt_libraries"
   qt_includes="$ac_qt_includes"
@@ -31021,10 +30747,10 @@
 if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
 
 
-{ $as_echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
-$as_echo_n "checking if Qt compiles without flags... " >&6; }
+{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
 if test "${kde_cv_qt_direct+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -31120,7 +30846,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
   kde_cv_qt_direct="yes"
 else
@@ -31149,12 +30875,12 @@
 
 
 if test "$kde_cv_qt_direct" = "yes"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   qt_libraries=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
 fi
 
@@ -31192,15 +30918,15 @@
    fi
 
 
-   { $as_echo "$as_me:$LINENO: checking for moc" >&5
-$as_echo_n "checking for moc... " >&6; }
+   { echo "$as_me:$LINENO: checking for moc" >&5
+echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
    if test -n "$MOC"; then
         kde_cv_path="$MOC";
    else
         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -31242,10 +30968,10 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+    { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
 Please check whether you installed Qt correctly.
 You need to have a running moc binary.
 configure tried to run $ac_cv_path_moc and the test didn't
@@ -31253,7 +30979,7 @@
 the environment variable MOC to the right one before running
 configure.
 " >&5
-$as_echo "$as_me: error: No Qt meta object compiler (moc) found!
+echo "$as_me: error: No Qt meta object compiler (moc) found!
 Please check whether you installed Qt correctly.
 You need to have a running moc binary.
 configure tried to run $ac_cv_path_moc and the test didn't
@@ -31264,23 +30990,23 @@
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       MOC=$kde_cv_path
 
    fi
 
    if test -z "$UIC_NOT_NEEDED"; then
 
-   { $as_echo "$as_me:$LINENO: checking for uic" >&5
-$as_echo_n "checking for uic... " >&6; }
+   { echo "$as_me:$LINENO: checking for uic" >&5
+echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
    if test -n "$UIC_PATH"; then
         kde_cv_path="$UIC_PATH";
    else
         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -31322,19 +31048,19 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
       UIC_PATH=""
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       UIC_PATH=$kde_cv_path
 
    fi
 
      if test -z "$UIC_PATH" ; then
 
-    { $as_echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
+    { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
 Please check whether you installed Qt correctly.
 You need to have a running uic binary.
 configure tried to run $ac_cv_path_uic and the test didn't
@@ -31342,7 +31068,7 @@
 the environment variable UIC to the right one before running
 configure.
 " >&5
-$as_echo "$as_me: WARNING: No Qt ui compiler (uic) found!
+echo "$as_me: WARNING: No Qt ui compiler (uic) found!
 Please check whether you installed Qt correctly.
 You need to have a running uic binary.
 configure tried to run $ac_cv_path_uic and the test didn't
@@ -31357,11 +31083,11 @@
 
        if test $kde_qtver = 3; then
 
-    { $as_echo "$as_me:$LINENO: checking whether uic supports -L " >&5
-$as_echo_n "checking whether uic supports -L ... " >&6; }
+    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
     if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         cat >conftest.ui <<EOT
@@ -31371,7 +31097,7 @@
         if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
   (eval $ac_uic_testrun) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
             eval "kde_cv_prog_uic_$kde_cache=yes"
         else
@@ -31383,23 +31109,23 @@
 
 
     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
         :
         ac_uic_supports_libpath=yes
     else
-        { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
         :
         ac_uic_supports_libpath=no
     fi
 
 
-    { $as_echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
-$as_echo_n "checking whether uic supports -nounload ... " >&6; }
+    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
     if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         cat >conftest.ui <<EOT
@@ -31409,7 +31135,7 @@
         if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
   (eval $ac_uic_testrun) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
             eval "kde_cv_prog_uic_$kde_cache=yes"
         else
@@ -31421,13 +31147,13 @@
 
 
     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
         :
         ac_uic_supports_nounload=yes
     else
-        { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+        { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
         :
         ac_uic_supports_nounload=no
     fi
@@ -31458,10 +31184,10 @@
 
 
 if test -n "$LIBJPEG"; then
-{ $as_echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
-$as_echo_n "checking if Qt needs $LIBJPEG... " >&6; }
+{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
 if test "${kde_cv_qt_jpeg+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -31503,30 +31229,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_qt_jpeg=no"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "kde_cv_qt_jpeg=yes"
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS="$ac_save_LIBS"
@@ -31543,12 +31265,12 @@
 
 
 if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
   LIBJPEG_QT='$(LIBJPEG)'
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
   LIBJPEG_QT=
 fi
 
@@ -31579,8 +31301,8 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for rpath" >&5
-$as_echo_n "checking for rpath... " >&6; }
+{ echo "$as_me:$LINENO: checking for rpath" >&5
+echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
 # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath; USE_RPATH=$enableval
@@ -31611,11 +31333,11 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: result: $USE_RPATH" >&5
-$as_echo "$USE_RPATH" >&6; }
+{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+echo "${ECHO_T}$USE_RPATH" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking for KDE" >&5
-$as_echo_n "checking for KDE... " >&6; }
+{ echo "$as_me:$LINENO: checking for KDE" >&5
+echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
 
 if test "${prefix}" != NONE; then
   kde_includes=${includedir}
@@ -31644,7 +31366,7 @@
 fi
 
 if test "${ac_cv_have_kde+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   #try to guess kde locations
 
@@ -31667,7 +31389,7 @@
 do
   for j in $kde_check_header;
   do
-    echo "configure: 31670: $i/$j" >&5
+    echo "configure: 31392: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_incdir=$i
@@ -31679,10 +31401,10 @@
 ac_kde_includes="$kde_incdir"
 
 if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-  { { $as_echo "$as_me:$LINENO: error:
+  { { echo "$as_me:$LINENO: error:
 in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!" >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
 in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
@@ -31697,7 +31419,7 @@
 do
   for j in $kde_check_lib;
   do
-    echo "configure: 31700: $i/$j" >&5
+    echo "configure: 31422: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_libdir=$i
@@ -31715,7 +31437,7 @@
 do
   for j in "kde3/plugins/designer/kdewidgets.la";
   do
-    echo "configure: 31718: $i/$j" >&5
+    echo "configure: 31440: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       kde_widgetdir=$i
@@ -31726,20 +31448,20 @@
 
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-{ { $as_echo "$as_me:$LINENO: error:
+{ { echo "$as_me:$LINENO: error:
 in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!" >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
 in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-{ { $as_echo "$as_me:$LINENO: error:
+{ { echo "$as_me:$LINENO: error:
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs" >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
 I can't find the designer plugins. These are required and should have been installed
 by kdelibs" >&2;}
    { (exit 1); exit 1; }; }
@@ -31774,12 +31496,12 @@
  fi
  if test "$exec_prefix" = NONE; then
   ac_kde_exec_prefix="$ac_kde_prefix"
-  { $as_echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
-$as_echo "will be installed in $ac_kde_prefix" >&6; }
+  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
  else
   ac_kde_exec_prefix="$exec_prefix"
-  { $as_echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
-$as_echo "will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
  fi
 
  kde_libraries="${libdir}"
@@ -31788,8 +31510,8 @@
 else
   ac_cv_have_kde="have_kde=yes \
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  { $as_echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
-$as_echo "libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
+  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
 
   kde_libraries="$ac_kde_libraries"
   kde_includes="$ac_kde_includes"
@@ -31827,10 +31549,10 @@
 
 if test x$ac_uic_supports_libpath = xyes; then
 
-{ $as_echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
-$as_echo_n "checking if UIC has KDE plugins available... " >&6; }
+{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
 if test "${kde_cv_uic_plugins+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat > actest.ui << EOF
@@ -31857,7 +31579,7 @@
 if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5
   (eval $kde_line) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
 	# if you're trying to debug this check and think it's incorrect,
 	# better check your installation. The check _is_ correct - your
@@ -31871,10 +31593,10 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
-$as_echo "$kde_cv_uic_plugins" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
 if test "$kde_cv_uic_plugins" != yes; then
-	{ { $as_echo "$as_me:$LINENO: error:
+	{ { echo "$as_me:$LINENO: error:
 you need to install kdelibs first.
 
 If you did install kdelibs, then the Qt version that is picked up by
@@ -31883,7 +31605,7 @@
 _same Qt version_, compiled with the _same compiler_ and the same Qt
 configuration settings.
 " >&5
-$as_echo "$as_me: error:
+echo "$as_me: error:
 you need to install kdelibs first.
 
 If you did install kdelibs, then the Qt version that is picked up by
@@ -31926,12 +31648,12 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for KDE paths" >&5
-$as_echo_n "checking for KDE paths... " >&6; }
+{ echo "$as_me:$LINENO: checking for KDE paths" >&5
+echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
 kde_result=""
 kde_cached_paths=yes
 if test "${kde_cv_all_paths+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -32038,12 +31760,12 @@
 else
 
   if test $kde_qtver = 1; then
-     { $as_echo "$as_me:$LINENO: result: compiling" >&5
-$as_echo "compiling" >&6; }
+     { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
 
 
-    { $as_echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-$as_echo_n "checking for KDE headers installed... " >&6; }
+    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
 
      ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -32095,15 +31817,15 @@
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  else
-   { { $as_echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+   { { 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.
 For more details about this problem, look at the end of config.log." >&5
-$as_echo "$as_me: error: your system is not able to compile a small KDE application!
+echo "$as_me: error: your system is not able to compile a small KDE application!
 Check, if you installed the KDE header files correctly.
 For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
@@ -32137,23 +31859,23 @@
      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
   fi
 
-{ $as_echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-$as_echo_n "checking for KDE libraries installed... " >&6; }
+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
 ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  { { $as_echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+  { { 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
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&5
-$as_echo "$as_me: error: your system fails at linking a small KDE application!
+echo "$as_me: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&2;}
@@ -32198,8 +31920,8 @@
 
 
   else
-     { { $as_echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-$as_echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
+     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
+echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -32340,12 +32062,12 @@
 else
 
   if test $kde_qtver = 1; then
-     { $as_echo "$as_me:$LINENO: result: compiling" >&5
-$as_echo "compiling" >&6; }
+     { echo "$as_me:$LINENO: result: compiling" >&5
+echo "${ECHO_T}compiling" >&6; }
 
 
-    { $as_echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-$as_echo_n "checking for KDE headers installed... " >&6; }
+    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
 
      ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -32397,15 +32119,15 @@
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  else
-   { { $as_echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+   { { 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.
 For more details about this problem, look at the end of config.log." >&5
-$as_echo "$as_me: error: your system is not able to compile a small KDE application!
+echo "$as_me: error: your system is not able to compile a small KDE application!
 Check, if you installed the KDE header files correctly.
 For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
@@ -32439,23 +32161,23 @@
      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
   fi
 
-{ $as_echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-$as_echo_n "checking for KDE libraries installed... " >&6; }
+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
 ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  { { $as_echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+  { { 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
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&5
-$as_echo "$as_me: error: your system fails at linking a small KDE application!
+echo "$as_me: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
 same compiler to compile Qt and kdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&2;}
@@ -32500,8 +32222,8 @@
 
 
   else
-     { { $as_echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-$as_echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
+     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
+echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -32526,13 +32248,13 @@
   kde_result="$kde_result (cache overridden)"
 fi
 if test "$kde_have_all_paths" = "no"; then
-  { { $as_echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
+  { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
 Since it had compiled and linked before, it must be a strange problem on your system.
 Look at config.log for details. If you are not able to fix this, look at
 http://www.kde.org/faq/installation.html or any www.kde.org mirror.
 (If you're using an egcs version on Linux, you may update binutils!)
 " >&5
-$as_echo "$as_me: error: configure could not run a little KDE program to test the environment.
+echo "$as_me: error: configure could not run a little KDE program to test the environment.
 Since it had compiled and linked before, it must be a strange problem on your system.
 Look at config.log for details. If you are not able to fix this, look at
 http://www.kde.org/faq/installation.html or any www.kde.org mirror.
@@ -32541,8 +32263,8 @@
    { (exit 1); exit 1; }; }
 else
   rm -f conftest*
-  { $as_echo "$as_me:$LINENO: result: $kde_result" >&5
-$as_echo "$kde_result" >&6; }
+  { echo "$as_me:$LINENO: result: $kde_result" >&5
+echo "${ECHO_T}$kde_result" >&6; }
 fi
 
 bindir=$kde_bindir
@@ -32587,15 +32309,15 @@
 
         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
 
-   { $as_echo "$as_me:$LINENO: checking for dcopidl" >&5
-$as_echo_n "checking for dcopidl... " >&6; }
+   { echo "$as_me:$LINENO: checking for dcopidl" >&5
+echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
    if test -n "$DCOPIDL"; then
         kde_cv_path="$DCOPIDL";
    else
         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -32637,34 +32359,34 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+    { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
 Please check whether you installed KDE correctly.
 " >&5
-$as_echo "$as_me: error: The important program dcopidl was not found!
+echo "$as_me: error: The important program dcopidl was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       DCOPIDL=$kde_cv_path
 
    fi
 
 
-   { $as_echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
-$as_echo_n "checking for dcopidl2cpp... " >&6; }
+   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
    if test -n "$DCOPIDL2CPP"; then
         kde_cv_path="$DCOPIDL2CPP";
    else
         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -32706,35 +32428,35 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+    { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
 Please check whether you installed KDE correctly.
 " >&5
-$as_echo "$as_me: error: The important program dcopidl2cpp was not found!
+echo "$as_me: error: The important program dcopidl2cpp was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       DCOPIDL2CPP=$kde_cv_path
 
    fi
 
         if test "$build_arts" '!=' "no"; then
 
-   { $as_echo "$as_me:$LINENO: checking for mcopidl" >&5
-$as_echo_n "checking for mcopidl... " >&6; }
+   { echo "$as_me:$LINENO: checking for mcopidl" >&5
+echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
    if test -n "$MCOPIDL"; then
         kde_cv_path="$MCOPIDL";
    else
         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -32776,36 +32498,36 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&5
-$as_echo "$as_me: error: The important program mcopidl was not found!
+echo "$as_me: error: The important program mcopidl was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       MCOPIDL=$kde_cv_path
 
    fi
 
 
-   { $as_echo "$as_me:$LINENO: checking for artsc-config" >&5
-$as_echo_n "checking for artsc-config... " >&6; }
+   { echo "$as_me:$LINENO: checking for artsc-config" >&5
+echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
    if test -n "$ARTSCCONFIG"; then
         kde_cv_path="$ARTSCCONFIG";
    else
         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -32847,37 +32569,37 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&5
-$as_echo "$as_me: error: The important program artsc-config was not found!
+echo "$as_me: error: The important program artsc-config was not found!
 Please check whether you installed aRts correctly or use
 --without-arts to compile without aRts support (this will remove functionality).
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       ARTSCCONFIG=$kde_cv_path
 
    fi
 
         fi
 
-   { $as_echo "$as_me:$LINENO: checking for meinproc" >&5
-$as_echo_n "checking for meinproc... " >&6; }
+   { echo "$as_me:$LINENO: checking for meinproc" >&5
+echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
    if test -n "$MEINPROC"; then
         kde_cv_path="$MEINPROC";
    else
         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -32919,12 +32641,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       MEINPROC=$kde_cv_path
 
    fi
@@ -32953,15 +32675,15 @@
 
         if test -n "$kde32ornewer"; then
 
-   { $as_echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-$as_echo_n "checking for kconfig_compiler... " >&6; }
+   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
    if test -n "$KCONFIG_COMPILER"; then
         kde_cv_path="$KCONFIG_COMPILER";
    else
         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -33003,34 +32725,34 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+    { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&5
-$as_echo "$as_me: error: The important program kconfig_compiler was not found!
+echo "$as_me: error: The important program kconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       KCONFIG_COMPILER=$kde_cv_path
 
    fi
 
 
-   { $as_echo "$as_me:$LINENO: checking for dcopidlng" >&5
-$as_echo_n "checking for dcopidlng... " >&6; }
+   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
+echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
    if test -n "$DCOPIDLNG"; then
         kde_cv_path="$DCOPIDLNG";
    else
         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -33072,20 +32794,20 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+    { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
 Please check whether you installed KDE correctly.
 " >&5
-$as_echo "$as_me: error: The important program dcopidlng was not found!
+echo "$as_me: error: The important program dcopidlng was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       DCOPIDLNG=$kde_cv_path
 
    fi
@@ -33093,15 +32815,15 @@
         fi
         if test -n "$kde33ornewer"; then
 
-   { $as_echo "$as_me:$LINENO: checking for makekdewidgets" >&5
-$as_echo_n "checking for makekdewidgets... " >&6; }
+   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
    if test -n "$MAKEKDEWIDGETS"; then
         kde_cv_path="$MAKEKDEWIDGETS";
    else
         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -33143,20 +32865,20 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
-    { { $as_echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+    { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
 Please check whether you installed KDE correctly.
 " >&5
-$as_echo "$as_me: error: The important program makekdewidgets was not found!
+echo "$as_me: error: The important program makekdewidgets was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       MAKEKDEWIDGETS=$kde_cv_path
 
    fi
@@ -33164,15 +32886,15 @@
 
         fi
 
-   { $as_echo "$as_me:$LINENO: checking for xmllint" >&5
-$as_echo_n "checking for xmllint... " >&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 { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -33214,12 +32936,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
       XMLLINT=""
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       XMLLINT=$kde_cv_path
 
    fi
@@ -33234,7 +32956,7 @@
 do
   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
   do
-    echo "configure: 33237: $i/$j" >&5
+    echo "configure: 32959: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       KDE_XSL_STYLESHEET=$i
@@ -33404,8 +33126,8 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for Qt docs" >&5
-$as_echo_n "checking for Qt docs... " >&6; }
+{ echo "$as_me:$LINENO: checking for Qt docs" >&5
+echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
 kde_qtdir=
 if test "${with_qt_dir+set}" = set; then
   kde_qtdir="$with_qt_dir"
@@ -33417,7 +33139,7 @@
 do
   for j in qsql.html;
   do
-    echo "configure: 33420: $i/$j" >&5
+    echo "configure: 33142: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       QTDOCDIR=$i
@@ -33426,21 +33148,21 @@
   done
 done
 
-{ $as_echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
-$as_echo "$QTDOCDIR" >&6; }
+{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+echo "${ECHO_T}$QTDOCDIR" >&6; }
 
 
 
 
-   { $as_echo "$as_me:$LINENO: checking for dot" >&5
-$as_echo_n "checking for dot... " >&6; }
+   { echo "$as_me:$LINENO: checking for dot" >&5
+echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
    if test -n "$DOT"; then
         kde_cv_path="$DOT";
    else
         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -33482,12 +33204,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       DOT=$kde_cv_path
 
    fi
@@ -33499,15 +33221,15 @@
 fi
 
 
-   { $as_echo "$as_me:$LINENO: checking for doxygen" >&5
-$as_echo_n "checking for doxygen... " >&6; }
+   { echo "$as_me:$LINENO: checking for doxygen" >&5
+echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
    if test -n "$DOXYGEN"; then
         kde_cv_path="$DOXYGEN";
    else
         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
         kde_cv_path="NONE"
@@ -33549,12 +33271,12 @@
    fi
 
    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 
    else
-      { $as_echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-$as_echo "$kde_cv_path" >&6; }
+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+echo "${ECHO_T}$kde_cv_path" >&6; }
       DOXYGEN=$kde_cv_path
 
    fi
@@ -33593,8 +33315,8 @@
 
 digikam_save_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $all_includes"
-{ $as_echo "$as_me:$LINENO: checking if hidden visibility should be enabled" >&5
-$as_echo_n "checking if hidden visibility should be enabled... " >&6; }
+{ echo "$as_me:$LINENO: checking if hidden visibility should be enabled" >&5
+echo $ECHO_N "checking if hidden visibility should be enabled... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 
    #include <kdeversion.h>
@@ -33619,27 +33341,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+   { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
    digikam_enable_hidden_visibility="yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+	 { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 
 fi
 
@@ -33657,8 +33378,8 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
-$as_echo_n "checking grepping for visibility push/pop in headers... " >&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
 
@@ -33683,16 +33404,16 @@
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "GCC visibility push" >/dev/null 2>&1; then
 
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+      { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
       kde_stdc_visibility_patched=yes
 else
 
-      { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-      { $as_echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+      { 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
-$as_echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
                    visibility support. Disabling -fvisibility=hidden" >&2;}
 
       kde_stdc_visibility_patched=no
@@ -33709,11 +33430,11 @@
 
     kde_have_gcc_visibility=no
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
-$as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
 kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -33749,30 +33470,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -33786,8 +33503,8 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
 
       kde_have_gcc_visibility=yes
@@ -33799,10 +33516,10 @@
 fi
 
 
-      { $as_echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
-$as_echo_n "checking if Qt is patched for -fvisibility... " >&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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -33846,21 +33563,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   kde_cv_val_qt_gcc_visibility_patched=no
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_val_qt_gcc_visibility_patched=yes
@@ -33878,16 +33594,16 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
-$as_echo "$kde_cv_val_qt_gcc_visibility_patched" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
 
       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 
-    { $as_echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
-$as_echo_n "checking for gcc -fvisibility-inlines-hidden bug... " >&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
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -33936,30 +33652,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   kde_cv_val_gcc_visibility_bug=no
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	kde_cv_val_gcc_visibility_bug=yes
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
@@ -33974,8 +33686,8 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
-$as_echo "$kde_cv_val_gcc_visibility_bug" >&6; }
+{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
 
     if test x$kde_cv_val_gcc_visibility_bug = xno; then
       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
@@ -33991,8 +33703,8 @@
       fi
 
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -34010,10 +33722,10 @@
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_PKGCONFIGFOUND+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$PKGCONFIGFOUND"; then
   ac_cv_prog_PKGCONFIGFOUND="$PKGCONFIGFOUND" # Let the user override the test.
@@ -34026,7 +33738,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_PKGCONFIGFOUND="yes"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -34037,11 +33749,11 @@
 fi
 PKGCONFIGFOUND=$ac_cv_prog_PKGCONFIGFOUND
 if test -n "$PKGCONFIGFOUND"; then
-  { $as_echo "$as_me:$LINENO: result: $PKGCONFIGFOUND" >&5
-$as_echo "$PKGCONFIGFOUND" >&6; }
+  { echo "$as_me:$LINENO: result: $PKGCONFIGFOUND" >&5
+echo "${ECHO_T}$PKGCONFIGFOUND" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -34052,14 +33764,68 @@
 #
 # -----------------------------------------------------------------
 
-  # The cast to long int works around a bug in the HP C Compiler
+  { echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+if test "${ac_cv_type_int+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef int ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_int=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_int=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+echo "${ECHO_T}$ac_cv_type_int" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -34070,10 +33836,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -34086,14 +33853,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -34107,10 +33873,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34123,21 +33890,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -34151,7 +33917,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -34161,10 +33927,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -34177,14 +33944,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -34198,10 +33964,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34214,21 +33981,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -34242,7 +34008,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -34262,10 +34028,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34278,21 +34045,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -34303,9 +34069,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
 '') if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -34320,8 +34086,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (int)); }
-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
+   typedef int ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -34331,22 +34098,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (int))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (int))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (int))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -34359,46 +34124,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
+echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
 
 
 
@@ -34406,14 +34168,68 @@
 #define SIZEOF_INT $ac_cv_sizeof_int
 _ACEOF
 
-   # The cast to long int works around a bug in the HP C Compiler
+   { echo "$as_me:$LINENO: checking for short" >&5
+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+if test "${ac_cv_type_short+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef short ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_short=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_short=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+echo "${ECHO_T}$ac_cv_type_short" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_short+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -34424,10 +34240,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -34440,14 +34257,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -34461,10 +34277,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34477,21 +34294,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -34505,7 +34321,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -34515,10 +34331,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -34531,14 +34348,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -34552,10 +34368,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34568,21 +34385,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -34596,7 +34412,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -34616,10 +34432,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34632,21 +34449,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -34657,9 +34473,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
 '') if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
+echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -34674,8 +34490,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (short)); }
-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
+   typedef short ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -34685,22 +34502,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (short))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (short))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (short))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -34713,46 +34528,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
+echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_short=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
 
 
 
@@ -34760,31 +34572,27 @@
 #define SIZEOF_SHORT $ac_cv_sizeof_short
 _ACEOF
 
-  # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  { echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+if test "${ac_cv_type_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+typedef long ac__type_new_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
   return 0;
 }
 _ACEOF
@@ -34794,14 +34602,72 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_long=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+   typedef long ac__type_sizeof_;
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -34815,10 +34681,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34831,21 +34698,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -34859,7 +34725,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -34869,10 +34735,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -34885,14 +34752,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -34906,10 +34772,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34922,21 +34789,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -34950,7 +34816,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -34970,10 +34836,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34986,21 +34853,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -35011,9 +34877,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
 '') if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -35028,8 +34894,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
+   typedef long ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -35039,22 +34906,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (long))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (long))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (long))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -35067,46 +34932,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
+echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
 
 
 
@@ -35114,14 +34976,68 @@
 #define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
-  # The cast to long int works around a bug in the HP C Compiler
+  { echo "$as_me:$LINENO: checking for char *" >&5
+echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+if test "${ac_cv_type_char_p+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+typedef char * ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_char_p=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_char_p=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of char *" >&5
-$as_echo_n "checking size of char *... " >&6; }
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
 if test "${ac_cv_sizeof_char_p+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -35132,10 +35048,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -35148,14 +35065,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -35169,10 +35085,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35185,21 +35102,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -35213,7 +35129,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -35223,10 +35139,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
 test_array [0] = 0
 
   ;
@@ -35239,14 +35156,13 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -35260,10 +35176,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35276,21 +35193,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -35304,7 +35220,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -35324,10 +35240,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+   typedef char * ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (char *))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35340,21 +35257,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -35365,9 +35281,9 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_char_p=$ac_lo;;
 '') if test "$ac_cv_type_char_p" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char *)
+echo "$as_me: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
@@ -35382,8 +35298,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-static long int longval () { return (long int) (sizeof (char *)); }
-static unsigned long int ulongval () { return (long int) (sizeof (char *)); }
+   typedef char * ac__type_sizeof_;
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -35393,22 +35310,20 @@
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (char *))) < 0)
+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (char *))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%ld", i);
+      fprintf (f, "%ld\n", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (char *))))
+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
 	return 1;
-      fprintf (f, "%lu", i);
+      fprintf (f, "%lu\n", i);
     }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -35421,46 +35336,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_char_p=`cat conftest.val`
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 if test "$ac_cv_type_char_p" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char *)
+echo "$as_me: error: cannot compute sizeof (char *)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
    else
      ac_cv_sizeof_char_p=0
    fi
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-$as_echo "$ac_cv_sizeof_char_p" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
 
 
 
@@ -35483,72 +35395,28 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
-	       neither is defined;
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_bigendian=universal
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat >conftest.$ac_ext <<_ACEOF
+  # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-	     #include <sys/param.h>
+#include <sys/param.h>
 
 int
 main ()
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+#endif
 
   ;
   return 0;
@@ -35560,34 +35428,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 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.  */
 #include <sys/types.h>
-		#include <sys/param.h>
+#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
+ not big endian
+#endif
 
   ;
   return 0;
@@ -35599,21 +35466,20 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -35621,69 +35487,29 @@
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat >conftest.$ac_ext <<_ACEOF
+	# It does not; compile a test program.
+if test "$cross_compiling" = yes; then
+  # try to guess the endianness by grepping values into an object file
+  ac_cv_c_bigendian=unknown
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <limits.h>
-
+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
 int
 main ()
 {
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
+ _ascii (); _ebcdic ();
   ;
   return 0;
 }
@@ -35694,101 +35520,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+  if test "$ac_cv_c_bigendian" = unknown; then
+    ac_cv_c_bigendian=no
+  else
+    # finding both strings is unlikely to happen, but who knows?
+    ac_cv_c_bigendian=unknown
+  fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then
-  # Try to guess by grepping values from an object file.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -35807,14 +35562,14 @@
 main ()
 {
 
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long int l;
+    char c[sizeof (long int)];
+  } u;
+  u.l = 1;
+  return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -35826,57 +35581,55 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
-rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
-    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     cat >>confdefs.h <<\_ACEOF
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+case $ac_cv_c_bigendian in
+  yes)
+
+cat >>confdefs.h <<\_ACEOF
 #define WORDS_BIGENDIAN 1
 _ACEOF
-;; #(
-   no)
-      ;; #(
-   universal)
-      ;; #(
-   *)
-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+ ;;
+  no)
+     ;;
+  *)
+    { { echo "$as_me:$LINENO: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+echo "$as_me: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
- esac
+esac
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -35906,17 +35659,17 @@
 
 
    if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
-$as_echo_n "checking for lcms/lcms.h... " >&6; }
+  { echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
+echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_lcms_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
+echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
-$as_echo_n "checking lcms/lcms.h usability... " >&6; }
+{ echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
+echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -35932,33 +35685,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
-$as_echo_n "checking lcms/lcms.h presence... " >&6; }
+{ echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
+echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -35972,64 +35724,63 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: lcms/lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: lcms/lcms.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: lcms/lcms.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: lcms/lcms.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: lcms/lcms.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: lcms/lcms.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
-$as_echo_n "checking for lcms/lcms.h... " >&6; }
+{ echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
+echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_lcms_lcms_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_lcms_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
+echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
 
 fi
 if test $ac_cv_header_lcms_lcms_h = yes; then
@@ -36068,17 +35819,17 @@
 
 
    if test "${ac_cv_header_lcms_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for lcms.h" >&5
-$as_echo_n "checking for lcms.h... " >&6; }
+  { echo "$as_me:$LINENO: checking for lcms.h" >&5
+echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_lcms_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
+echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking lcms.h usability" >&5
-$as_echo_n "checking lcms.h usability... " >&6; }
+{ echo "$as_me:$LINENO: checking lcms.h usability" >&5
+echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -36094,33 +35845,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking lcms.h presence" >&5
-$as_echo_n "checking lcms.h presence... " >&6; }
+{ echo "$as_me:$LINENO: checking lcms.h presence" >&5
+echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -36134,64 +35884,63 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: lcms.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: lcms.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: lcms.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: lcms.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: lcms.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: lcms.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: lcms.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: lcms.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: lcms.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: lcms.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: lcms.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for lcms.h" >&5
-$as_echo_n "checking for lcms.h... " >&6; }
+{ echo "$as_me:$LINENO: checking for lcms.h" >&5
+echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_lcms_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_lcms_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-$as_echo "$ac_cv_header_lcms_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
+echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
 
 fi
 if test $ac_cv_header_lcms_h = yes; then
@@ -36256,30 +36005,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   LCMS_LIBS='-llcms'; have_lcms='yes'
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS=$saved_libs
@@ -36301,10 +36046,10 @@
 
 # Extract the first word of "gphoto2-config", so it can be a program name with args.
 set dummy gphoto2-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GPHOTO_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GPHOTO_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -36319,7 +36064,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GPHOTO_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -36331,20 +36076,20 @@
 fi
 GPHOTO_CONFIG=$ac_cv_path_GPHOTO_CONFIG
 if test -n "$GPHOTO_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $GPHOTO_CONFIG" >&5
-$as_echo "$GPHOTO_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $GPHOTO_CONFIG" >&5
+echo "${ECHO_T}$GPHOTO_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
 # Extract the first word of "gphoto2-port-config", so it can be a program name with args.
 set dummy gphoto2-port-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_GPHOTO_PORT_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $GPHOTO_PORT_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -36359,7 +36104,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GPHOTO_PORT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -36371,11 +36116,11 @@
 fi
 GPHOTO_PORT_CONFIG=$ac_cv_path_GPHOTO_PORT_CONFIG
 if test -n "$GPHOTO_PORT_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $GPHOTO_PORT_CONFIG" >&5
-$as_echo "$GPHOTO_PORT_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $GPHOTO_PORT_CONFIG" >&5
+echo "${ECHO_T}$GPHOTO_PORT_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -36385,8 +36130,8 @@
   LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`"
 
 else
-  { $as_echo "$as_me:$LINENO: WARNING: gPhoto2 not found." >&5
-$as_echo "$as_me: WARNING: gPhoto2 not found." >&2;}
+  { echo "$as_me:$LINENO: WARNING: gPhoto2 not found." >&5
+echo "$as_me: WARNING: gPhoto2 not found." >&2;}
   DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
 fi
 
@@ -36414,10 +36159,10 @@
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -36432,7 +36177,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -36445,11 +36190,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -36463,25 +36208,25 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libkipi >= 0.1.5" >&5
-$as_echo_n "checking for libkipi >= 0.1.5... " >&6; }
+        { echo "$as_me:$LINENO: checking for libkipi >= 0.1.5" >&5
+echo $ECHO_N "checking for libkipi >= 0.1.5... $ECHO_C" >&6; }
 
         if $PKG_CONFIG --exists "libkipi >= 0.1.5" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking LIBKIPI_CFLAGS" >&5
-$as_echo_n "checking LIBKIPI_CFLAGS... " >&6; }
+            { echo "$as_me:$LINENO: checking LIBKIPI_CFLAGS" >&5
+echo $ECHO_N "checking LIBKIPI_CFLAGS... $ECHO_C" >&6; }
             LIBKIPI_CFLAGS=`$PKG_CONFIG --cflags "libkipi >= 0.1.5"`
-            { $as_echo "$as_me:$LINENO: result: $LIBKIPI_CFLAGS" >&5
-$as_echo "$LIBKIPI_CFLAGS" >&6; }
+            { echo "$as_me:$LINENO: result: $LIBKIPI_CFLAGS" >&5
+echo "${ECHO_T}$LIBKIPI_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:$LINENO: checking LIBKIPI_LIBS" >&5
-$as_echo_n "checking LIBKIPI_LIBS... " >&6; }
+            { echo "$as_me:$LINENO: checking LIBKIPI_LIBS" >&5
+echo $ECHO_N "checking LIBKIPI_LIBS... $ECHO_C" >&6; }
             LIBKIPI_LIBS=`$PKG_CONFIG --libs "libkipi >= 0.1.5"`
-            { $as_echo "$as_me:$LINENO: result: $LIBKIPI_LIBS" >&5
-$as_echo "$LIBKIPI_LIBS" >&6; }
+            { echo "$as_me:$LINENO: result: $LIBKIPI_LIBS" >&5
+echo "${ECHO_T}$LIBKIPI_LIBS" >&6; }
         else
             LIBKIPI_CFLAGS=""
             LIBKIPI_LIBS=""
@@ -36510,17 +36255,17 @@
    if test "x$have_libkipi" = "xno"; then
 	LIBKIPI_CFLAGS=""
 	LIBKIPI_LIBS=""
-        { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+        { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
    else
-	{ $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+	{ echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
    fi
 else
    LIBKIPI_CFLAGS=""
    LIBKIPI_LIBS=""
-   { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+   { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 fi
 
 
@@ -36551,10 +36296,10 @@
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -36569,7 +36314,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -36582,11 +36327,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -36600,25 +36345,25 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libkexiv2 >= 0.1.6" >&5
-$as_echo_n "checking for libkexiv2 >= 0.1.6... " >&6; }
+        { echo "$as_me:$LINENO: checking for libkexiv2 >= 0.1.6" >&5
+echo $ECHO_N "checking for libkexiv2 >= 0.1.6... $ECHO_C" >&6; }
 
         if $PKG_CONFIG --exists "libkexiv2 >= 0.1.6" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking LIBKEXIV2_CFLAGS" >&5
-$as_echo_n "checking LIBKEXIV2_CFLAGS... " >&6; }
+            { echo "$as_me:$LINENO: checking LIBKEXIV2_CFLAGS" >&5
+echo $ECHO_N "checking LIBKEXIV2_CFLAGS... $ECHO_C" >&6; }
             LIBKEXIV2_CFLAGS=`$PKG_CONFIG --cflags "libkexiv2 >= 0.1.6"`
-            { $as_echo "$as_me:$LINENO: result: $LIBKEXIV2_CFLAGS" >&5
-$as_echo "$LIBKEXIV2_CFLAGS" >&6; }
+            { echo "$as_me:$LINENO: result: $LIBKEXIV2_CFLAGS" >&5
+echo "${ECHO_T}$LIBKEXIV2_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:$LINENO: checking LIBKEXIV2_LIBS" >&5
-$as_echo_n "checking LIBKEXIV2_LIBS... " >&6; }
+            { echo "$as_me:$LINENO: checking LIBKEXIV2_LIBS" >&5
+echo $ECHO_N "checking LIBKEXIV2_LIBS... $ECHO_C" >&6; }
             LIBKEXIV2_LIBS=`$PKG_CONFIG --libs "libkexiv2 >= 0.1.6"`
-            { $as_echo "$as_me:$LINENO: result: $LIBKEXIV2_LIBS" >&5
-$as_echo "$LIBKEXIV2_LIBS" >&6; }
+            { echo "$as_me:$LINENO: result: $LIBKEXIV2_LIBS" >&5
+echo "${ECHO_T}$LIBKEXIV2_LIBS" >&6; }
         else
             LIBKEXIV2_CFLAGS=""
             LIBKEXIV2_LIBS=""
@@ -36647,17 +36392,17 @@
    if test "x$have_libkexiv2" = "xno"; then
        LIBKEXIV2_CFLAGS=""
        LIBKEXIV2_LIBS=""
-       { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+       { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
    else
-       { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+       { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
    fi
 else
    LIBKEXIV2_CFLAGS=""
    LIBKEXIV2_LIBS=""
-   { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+   { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 fi
 
 
@@ -36688,10 +36433,10 @@
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -36706,7 +36451,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -36719,11 +36464,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -36737,25 +36482,25 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for libkdcraw >= 0.1.4" >&5
-$as_echo_n "checking for libkdcraw >= 0.1.4... " >&6; }
+        { echo "$as_me:$LINENO: checking for libkdcraw >= 0.1.4" >&5
+echo $ECHO_N "checking for libkdcraw >= 0.1.4... $ECHO_C" >&6; }
 
         if $PKG_CONFIG --exists "libkdcraw >= 0.1.4" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking LIBKDCRAW_CFLAGS" >&5
-$as_echo_n "checking LIBKDCRAW_CFLAGS... " >&6; }
+            { echo "$as_me:$LINENO: checking LIBKDCRAW_CFLAGS" >&5
+echo $ECHO_N "checking LIBKDCRAW_CFLAGS... $ECHO_C" >&6; }
             LIBKDCRAW_CFLAGS=`$PKG_CONFIG --cflags "libkdcraw >= 0.1.4"`
-            { $as_echo "$as_me:$LINENO: result: $LIBKDCRAW_CFLAGS" >&5
-$as_echo "$LIBKDCRAW_CFLAGS" >&6; }
+            { echo "$as_me:$LINENO: result: $LIBKDCRAW_CFLAGS" >&5
+echo "${ECHO_T}$LIBKDCRAW_CFLAGS" >&6; }
 
-            { $as_echo "$as_me:$LINENO: checking LIBKDCRAW_LIBS" >&5
-$as_echo_n "checking LIBKDCRAW_LIBS... " >&6; }
+            { echo "$as_me:$LINENO: checking LIBKDCRAW_LIBS" >&5
+echo $ECHO_N "checking LIBKDCRAW_LIBS... $ECHO_C" >&6; }
             LIBKDCRAW_LIBS=`$PKG_CONFIG --libs "libkdcraw >= 0.1.4"`
-            { $as_echo "$as_me:$LINENO: result: $LIBKDCRAW_LIBS" >&5
-$as_echo "$LIBKDCRAW_LIBS" >&6; }
+            { echo "$as_me:$LINENO: result: $LIBKDCRAW_LIBS" >&5
+echo "${ECHO_T}$LIBKDCRAW_LIBS" >&6; }
         else
             LIBKDCRAW_CFLAGS=""
             LIBKDCRAW_LIBS=""
@@ -36784,17 +36529,17 @@
    if test "x$have_libkdcraw" = "xno"; then
        LIBKDCRAW_CFLAGS=""
        LIBKDCRAW_LIBS=""
-       { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+       { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
    else
-       { $as_echo "$as_me:$LINENO: result: found" >&5
-$as_echo "found" >&6; }
+       { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
    fi
 else
    LIBKDCRAW_CFLAGS=""
    LIBKDCRAW_LIBS=""
-   { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
+   { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
 fi
 
 
@@ -36819,10 +36564,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { $as_echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5
-$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; }
+     { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5
+echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; }
 if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff -ljpeg -lz -lm $LIBS"
@@ -36854,41 +36599,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_tiff_TIFFWriteScanline=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_tiff_TIFFWriteScanline=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
-$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5
+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; }
 if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then
   have_tiff=yes
 else
-  { $as_echo "$as_me:$LINENO: WARNING: TIFF library not found" >&5
-$as_echo "$as_me: WARNING: TIFF library not found" >&2;}
+  { echo "$as_me:$LINENO: WARNING: TIFF library not found" >&5
+echo "$as_me: WARNING: TIFF library not found" >&2;}
 fi
 
      LDFLAGS="$kde_save_LDFLAGS"
@@ -36910,17 +36651,17 @@
 
 
    if test "${ac_cv_header_tiffio_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
-$as_echo_n "checking for tiffio.h... " >&6; }
+  { echo "$as_me:$LINENO: checking for tiffio.h" >&5
+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_tiffio_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
-$as_echo "$ac_cv_header_tiffio_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; }
 else
   # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5
-$as_echo_n "checking tiffio.h usability... " >&6; }
+{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5
+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -36936,33 +36677,32 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5
-$as_echo_n "checking tiffio.h presence... " >&6; }
+{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5
+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -36976,64 +36716,63 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  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
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$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
   yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: tiffio.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: tiffio.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: tiffio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
-$as_echo_n "checking for tiffio.h... " >&6; }
+{ echo "$as_me:$LINENO: checking for tiffio.h" >&5
+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_tiffio_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_header_tiffio_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
-$as_echo "$ac_cv_header_tiffio_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; }
 
 fi
 if test $ac_cv_header_tiffio_h = yes; then
@@ -37054,8 +36793,8 @@
 fi
 
 if test "x$have_tiff" != "xyes"; then
-  { $as_echo "$as_me:$LINENO: WARNING: TIFF library not found, digiKam will not be compiled." >&5
-$as_echo "$as_me: WARNING: TIFF library not found, digiKam will not be compiled." >&2;}
+  { echo "$as_me:$LINENO: WARNING: TIFF library not found, digiKam will not be compiled." >&5
+echo "$as_me: WARNING: TIFF library not found, digiKam will not be compiled." >&2;}
   DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
 else
   LIB_TIFF="-ltiff"
@@ -37078,10 +36817,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { $as_echo "$as_me:$LINENO: checking for png_set_add_alpha in -lpng" >&5
-$as_echo_n "checking for png_set_add_alpha in -lpng... " >&6; }
+     { echo "$as_me:$LINENO: checking for png_set_add_alpha in -lpng" >&5
+echo $ECHO_N "checking for png_set_add_alpha in -lpng... $ECHO_C" >&6; }
 if test "${ac_cv_lib_png_png_set_add_alpha+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lpng -lz -lm $LIBS"
@@ -37113,41 +36852,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_png_png_set_add_alpha=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_png_png_set_add_alpha=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_add_alpha" >&5
-$as_echo "$ac_cv_lib_png_png_set_add_alpha" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_set_add_alpha" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_set_add_alpha" >&6; }
 if test $ac_cv_lib_png_png_set_add_alpha = yes; then
   have_png=yes
 else
-  { $as_echo "$as_me:$LINENO: WARNING: digiKam requires libpng >= 1.2.7" >&5
-$as_echo "$as_me: WARNING: digiKam requires libpng >= 1.2.7" >&2;}
+  { echo "$as_me:$LINENO: WARNING: digiKam requires libpng >= 1.2.7" >&5
+echo "$as_me: WARNING: digiKam requires libpng >= 1.2.7" >&2;}
 fi
 
      LDFLAGS="$kde_save_LDFLAGS"
@@ -37155,8 +36890,8 @@
 
 
 if test "x$have_png" != "xyes"; then
-  { $as_echo "$as_me:$LINENO: WARNING: digiKam requires libpng >= 1.2.7; digiKam will not be compiled." >&5
-$as_echo "$as_me: WARNING: digiKam requires libpng >= 1.2.7; digiKam will not be compiled." >&2;}
+  { echo "$as_me:$LINENO: WARNING: digiKam requires libpng >= 1.2.7; digiKam will not be compiled." >&5
+echo "$as_me: WARNING: digiKam requires libpng >= 1.2.7; digiKam will not be compiled." >&2;}
   DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
 else
   LIB_PNG="-lpng"
@@ -37179,10 +36914,10 @@
 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
 	;;
      esac
-     { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5
-$as_echo_n "checking for jas_init in -ljasper... " >&6; }
+     { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5
+echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; }
 if test "${ac_cv_lib_jasper_jas_init+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljasper -ljasper $LIBS"
@@ -37214,41 +36949,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   ac_cv_lib_jasper_jas_init=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_jasper_jas_init=no
 fi
 
-rm -rf conftest.dSYM
 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
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5
-$as_echo "$ac_cv_lib_jasper_jas_init" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5
+echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; }
 if test $ac_cv_lib_jasper_jas_init = yes; then
   have_jasper=yes
 else
-  { $as_echo "$as_me:$LINENO: WARNING: digiKam requires libjasper >= 1.7.0" >&5
-$as_echo "$as_me: WARNING: digiKam requires libjasper >= 1.7.0" >&2;}
+  { echo "$as_me:$LINENO: WARNING: digiKam requires libjasper >= 1.7.0" >&5
+echo "$as_me: WARNING: digiKam requires libjasper >= 1.7.0" >&2;}
 fi
 
      LDFLAGS="$kde_save_LDFLAGS"
@@ -37256,8 +36987,8 @@
 
 
 if test "x$have_jasper" != "xyes"; then
-  { $as_echo "$as_me:$LINENO: WARNING: digiKam requires libjasper >= 1.7.0; digiKam will not be compiled." >&5
-$as_echo "$as_me: WARNING: digiKam requires libjasper >= 1.7.0; digiKam will not be compiled." >&2;}
+  { echo "$as_me:$LINENO: WARNING: digiKam requires libjasper >= 1.7.0; digiKam will not be compiled." >&5
+echo "$as_me: WARNING: digiKam requires libjasper >= 1.7.0; digiKam will not be compiled." >&2;}
   DO_NOT_COMPILE="digikam $DO_NOT_COMPILE"
 else
   LIB_JASPER="-ljasper"
@@ -37290,10 +37021,10 @@
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -37308,7 +37039,7 @@
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -37321,11 +37052,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
 
@@ -37339,31 +37070,31 @@
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        { $as_echo "$as_me:$LINENO: checking for sqlite3 >= 3.5" >&5
-$as_echo_n "checking for sqlite3 >= 3.5... " >&6; }
+        { echo "$as_me:$LINENO: checking for sqlite3 >= 3.4.2" >&5
+echo $ECHO_N "checking for sqlite3 >= 3.4.2... $ECHO_C" >&6; }
 
-        if $PKG_CONFIG --exists "sqlite3 >= 3.5" ; then
-            { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+        if $PKG_CONFIG --exists "sqlite3 >= 3.4.2" ; then
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
             succeeded=yes
 
-            { $as_echo "$as_me:$LINENO: checking SQLITE_CFLAGS" >&5
-$as_echo_n "checking SQLITE_CFLAGS... " >&6; }
-            SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.5"`
-            { $as_echo "$as_me:$LINENO: result: $SQLITE_CFLAGS" >&5
-$as_echo "$SQLITE_CFLAGS" >&6; }
-
-            { $as_echo "$as_me:$LINENO: checking SQLITE_LIBS" >&5
-$as_echo_n "checking SQLITE_LIBS... " >&6; }
-            SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.5"`
-            { $as_echo "$as_me:$LINENO: result: $SQLITE_LIBS" >&5
-$as_echo "$SQLITE_LIBS" >&6; }
+            { echo "$as_me:$LINENO: checking SQLITE_CFLAGS" >&5
+echo $ECHO_N "checking SQLITE_CFLAGS... $ECHO_C" >&6; }
+            SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.4.2"`
+            { echo "$as_me:$LINENO: result: $SQLITE_CFLAGS" >&5
+echo "${ECHO_T}$SQLITE_CFLAGS" >&6; }
+
+            { echo "$as_me:$LINENO: checking SQLITE_LIBS" >&5
+echo $ECHO_N "checking SQLITE_LIBS... $ECHO_C" >&6; }
+            SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.4.2"`
+            { echo "$as_me:$LINENO: result: $SQLITE_LIBS" >&5
+echo "${ECHO_T}$SQLITE_LIBS" >&6; }
         else
             SQLITE_CFLAGS=""
             SQLITE_LIBS=""
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
-            SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.5"`
+            SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.4.2"`
 
         fi
 
@@ -37432,8 +37163,8 @@
 #define NFS_HACK 1
 _ACEOF
 
-   { $as_echo "$as_me:$LINENO: NFS hack enabled. Make sure you know what you are doing" >&5
-$as_echo "$as_me: NFS hack enabled. Make sure you know what you are doing" >&6;}
+   { echo "$as_me:$LINENO: NFS hack enabled. Make sure you know what you are doing" >&5
+echo "$as_me: NFS hack enabled. Make sure you know what you are doing" >&6;}
 fi
 
 #------------------------------------------------------------------
@@ -37447,11 +37178,11 @@
 #------------------------------------------------------------------
 
 
-{ $as_echo "$as_me:$LINENO: checking whether $CXX supports -fno-tree-pre" >&5
-$as_echo_n "checking whether $CXX supports -fno-tree-pre... " >&6; }
+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-tree-pre" >&5
+echo $ECHO_N "checking whether $CXX supports -fno-tree-pre... $ECHO_C" >&6; }
 kde_cache=`echo fno-tree-pre | sed 'y% .=/+-,%____p__%'`
 if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -37487,30 +37218,26 @@
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+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
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   eval "kde_cv_prog_cxx_$kde_cache=yes"
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   CXXFLAGS="$save_CXXFLAGS"
@@ -37524,13 +37251,13 @@
 fi
 
 if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
  :
  CXXFLAGS="-fno-tree-pre $CXXFLAGS"
 else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
  :
 
 fi
@@ -37575,12 +37302,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -37613,12 +37339,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -37634,7 +37360,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -37646,62 +37372,61 @@
 
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${unsermake_enable_pch_TRUE}" && test -z "${unsermake_enable_pch_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
+echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_x11_TRUE}" && test -z "${include_x11_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_x11\" was never defined.
+echo "$as_me: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_ARTS\" was never defined.
+echo "$as_me: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${with_included_sqlite3_TRUE}" && test -z "${with_included_sqlite3_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
+echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -37714,7 +37439,7 @@
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -37724,7 +37449,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -37746,45 +37471,17 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Support unset when possible.
@@ -37800,6 +37497,8 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -37822,7 +37521,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -37835,10 +37534,17 @@
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -37860,7 +37566,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -37911,7 +37617,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -37939,6 +37645,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -37951,22 +37658,19 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
@@ -37991,10 +37695,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
-	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -38017,7 +37721,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -38030,7 +37734,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -38038,7 +37742,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -38051,9 +37755,9 @@
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+		   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+		   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -38067,13 +37771,13 @@
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.62,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -38081,12 +37785,11 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -38108,36 +37811,30 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
+    { echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
+  -*) { echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -38156,29 +37853,27 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
   export CONFIG_SHELL
-  exec "\$@"
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 #
 # INIT-COMMANDS
 #
@@ -38186,7 +37881,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -38196,8 +37891,8 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "digikam/utilities/hotplug/digikam-download.desktop") CONFIG_FILES="$CONFIG_FILES digikam/utilities/hotplug/digikam-download.desktop" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -38238,143 +37933,421 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
 if test -n "$CONFIG_FILES"; then
 
+_ACEOF
 
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+KDECONFIG!$KDECONFIG$ac_delim
+kde_libs_prefix!$kde_libs_prefix$ac_delim
+kde_libs_htmldir!$kde_libs_htmldir$ac_delim
+CONF_FILES!$CONF_FILES$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
 
 
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  cat >conf$$subs.sed <<_ACEOF
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
+unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
+unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
+USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
+USE_RTTI!$USE_RTTI$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
+NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
+ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
+LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
+LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
+KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
+KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
+KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
+KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
+KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
+KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
+KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+KDE_PLUGIN!$KDE_PLUGIN$ac_delim
+KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+LIBUTIL!$LIBUTIL$ac_delim
+LIBCOMPAT!$LIBCOMPAT$ac_delim
+LIBCRYPT!$LIBCRYPT$ac_delim
+LIBRESOLV!$LIBRESOLV$ac_delim
+LIB_POLL!$LIB_POLL$ac_delim
+FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
+LIBSOCKET!$LIBSOCKET$ac_delim
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+LIBUCB!$LIBUCB$ac_delim
+LIBDL!$LIBDL$ac_delim
+KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
+KDE_USE_PIE!$KDE_USE_PIE$ac_delim
+include_x11_TRUE!$include_x11_TRUE$ac_delim
+include_x11_FALSE!$include_x11_FALSE$ac_delim
+XMKMF!$XMKMF$ac_delim
+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
+LIB_X11!$LIB_X11$ac_delim
+LIB_XRENDER!$LIB_XRENDER$ac_delim
+LIBSM!$LIBSM$ac_delim
+X_INCLUDES!$X_INCLUDES$ac_delim
+X_LDFLAGS!$X_LDFLAGS$ac_delim
+x_includes!$x_includes$ac_delim
+x_libraries!$x_libraries$ac_delim
+QTE_NORTTI!$QTE_NORTTI$ac_delim
+LIB_XEXT!$LIB_XEXT$ac_delim
+LIBPTHREAD!$LIBPTHREAD$ac_delim
+USE_THREADS!$USE_THREADS$ac_delim
+KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
+KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
+USER_INCLUDES!$USER_INCLUDES$ac_delim
+USER_LDFLAGS!$USER_LDFLAGS$ac_delim
+LIBZ!$LIBZ$ac_delim
+LIBPNG!$LIBPNG$ac_delim
+LIBJPEG!$LIBJPEG$ac_delim
+qt_libraries!$qt_libraries$ac_delim
+qt_includes!$qt_includes$ac_delim
+QT_INCLUDES!$QT_INCLUDES$ac_delim
+QT_LDFLAGS!$QT_LDFLAGS$ac_delim
+PERL!$PERL$ac_delim
+MOC!$MOC$ac_delim
+UIC!$UIC$ac_delim
+UIC_TR!$UIC_TR$ac_delim
+LIB_QT!$LIB_QT$ac_delim
+LIB_QPE!$LIB_QPE$ac_delim
+kde_qtver!$kde_qtver$ac_delim
+KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
+KDE_RPATH!$KDE_RPATH$ac_delim
+X_RPATH!$X_RPATH$ac_delim
+kde_libraries!$kde_libraries$ac_delim
+kde_includes!$kde_includes$ac_delim
+KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
+KDE_INCLUDES!$KDE_INCLUDES$ac_delim
+all_includes!$all_includes$ac_delim
+all_libraries!$all_libraries$ac_delim
+AUTODIRS!$AUTODIRS$ac_delim
+include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
+include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
+MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+DCOPIDLNG!$DCOPIDLNG$ac_delim
+_ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
-rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
 
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+DCOPIDL!$DCOPIDL$ac_delim
+DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
+DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
+MCOPIDL!$MCOPIDL$ac_delim
+ARTSCCONFIG!$ARTSCCONFIG$ac_delim
+MEINPROC!$MEINPROC$ac_delim
+KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
+XMLLINT!$XMLLINT$ac_delim
+kde_htmldir!$kde_htmldir$ac_delim
+kde_appsdir!$kde_appsdir$ac_delim
+kde_icondir!$kde_icondir$ac_delim
+kde_sounddir!$kde_sounddir$ac_delim
+kde_datadir!$kde_datadir$ac_delim
+kde_locale!$kde_locale$ac_delim
+kde_confdir!$kde_confdir$ac_delim
+kde_kcfgdir!$kde_kcfgdir$ac_delim
+kde_mimedir!$kde_mimedir$ac_delim
+kde_wallpaperdir!$kde_wallpaperdir$ac_delim
+kde_bindir!$kde_bindir$ac_delim
+xdg_appsdir!$xdg_appsdir$ac_delim
+xdg_menudir!$xdg_menudir$ac_delim
+xdg_directorydir!$xdg_directorydir$ac_delim
+kde_templatesdir!$kde_templatesdir$ac_delim
+kde_servicesdir!$kde_servicesdir$ac_delim
+kde_servicetypesdir!$kde_servicetypesdir$ac_delim
+kde_moduledir!$kde_moduledir$ac_delim
+kdeinitdir!$kdeinitdir$ac_delim
+kde_styledir!$kde_styledir$ac_delim
+kde_widgetdir!$kde_widgetdir$ac_delim
+LIB_KDED!$LIB_KDED$ac_delim
+LIB_KDECORE!$LIB_KDECORE$ac_delim
+LIB_KDEUI!$LIB_KDEUI$ac_delim
+LIB_KIO!$LIB_KIO$ac_delim
+LIB_KJS!$LIB_KJS$ac_delim
+LIB_SMB!$LIB_SMB$ac_delim
+LIB_KAB!$LIB_KAB$ac_delim
+LIB_KABC!$LIB_KABC$ac_delim
+LIB_KHTML!$LIB_KHTML$ac_delim
+LIB_KSPELL!$LIB_KSPELL$ac_delim
+LIB_KPARTS!$LIB_KPARTS$ac_delim
+LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
+LIB_KUTILS!$LIB_KUTILS$ac_delim
+LIB_KDEPIM!$LIB_KDEPIM$ac_delim
+LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
+LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
+LIB_KDNSSD!$LIB_KDNSSD$ac_delim
+LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
+LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
+LIB_KFILE!$LIB_KFILE$ac_delim
+LIB_KFM!$LIB_KFM$ac_delim
+LIB_ARTS!$LIB_ARTS$ac_delim
+QTDOCDIR!$QTDOCDIR$ac_delim
+KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
+DOXYGEN!$DOXYGEN$ac_delim
+DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
+DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
+KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
+PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim
+LCMS_LIBS!$LCMS_LIBS$ac_delim
+GPHOTO_CONFIG!$GPHOTO_CONFIG$ac_delim
+GPHOTO_PORT_CONFIG!$GPHOTO_PORT_CONFIG$ac_delim
+GPHOTO_CFLAGS!$GPHOTO_CFLAGS$ac_delim
+LIB_GPHOTO!$LIB_GPHOTO$ac_delim
+LIBKIPI_CFLAGS!$LIBKIPI_CFLAGS$ac_delim
+LIBKIPI_LIBS!$LIBKIPI_LIBS$ac_delim
+LIBKEXIV2_CFLAGS!$LIBKEXIV2_CFLAGS$ac_delim
+LIBKEXIV2_LIBS!$LIBKEXIV2_LIBS$ac_delim
+LIBKDCRAW_CFLAGS!$LIBKDCRAW_CFLAGS$ac_delim
+LIBKDCRAW_LIBS!$LIBKDCRAW_LIBS$ac_delim
+LIB_TIFF!$LIB_TIFF$ac_delim
+LIB_PNG!$LIB_PNG$ac_delim
+LIB_JASPER!$LIB_JASPER$ac_delim
+SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
+SQLITE_LIBS!$SQLITE_LIBS$ac_delim
+LIB_SQLITE3!$LIB_SQLITE3$ac_delim
+with_included_sqlite3_TRUE!$with_included_sqlite3_TRUE$ac_delim
+with_included_sqlite3_FALSE!$with_included_sqlite3_FALSE$ac_delim
+digikamhelper_dir!$digikamhelper_dir$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
 _ACEOF
 
+
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -38390,133 +38363,19 @@
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 fi # test -n "$CONFIG_FILES"
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", line, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -38545,38 +38404,26 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      ac_file_inputs="$ac_file_inputs $ac_f"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
     fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$tmp/stdin";;
     esac
     ;;
   esac
@@ -38586,7 +38433,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -38612,7 +38459,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -38621,7 +38468,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -38642,17 +38489,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -38697,13 +38544,12 @@
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-ac_sed_dataroot='
-/datarootdir/ {
+case `sed -n '/datarootdir/ {
   p
   q
 }
@@ -38712,14 +38558,13 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+' $ac_file_inputs` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -38733,16 +38578,15 @@
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -38753,60 +38597,121 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      rm -f $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
+  rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -38821,7 +38726,7 @@
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -38841,8 +38746,8 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -38864,7 +38769,7 @@
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -38908,7 +38813,7 @@
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
+echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -38934,7 +38839,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -38943,7 +38848,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -38964,8 +38869,8 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -38979,19 +38884,9 @@
 
 { (exit 0); exit 0; }
 _ACEOF
-if test "x$with_fast_perl" = "xyes"; then    
-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
-  rm -f $CONFIG_STATUS.bak
-fi    
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -39013,10 +38908,6 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
 
 ac_config_files="$ac_config_files digikam/utilities/hotplug/digikam-gphoto2-camera.desktop"
 
@@ -39047,12 +38938,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -39085,12 +38975,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -39106,7 +38996,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -39118,62 +39008,61 @@
 
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${unsermake_enable_pch_TRUE}" && test -z "${unsermake_enable_pch_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
+echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_x11_TRUE}" && test -z "${include_x11_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_x11\" was never defined.
+echo "$as_me: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_ARTS\" was never defined.
+echo "$as_me: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${with_included_sqlite3_TRUE}" && test -z "${with_included_sqlite3_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
+echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -39186,7 +39075,7 @@
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -39196,7 +39085,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -39218,45 +39107,17 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Support unset when possible.
@@ -39272,6 +39133,8 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -39294,7 +39157,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -39307,10 +39170,17 @@
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -39332,7 +39202,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -39383,7 +39253,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -39411,6 +39281,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -39423,22 +39294,19 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
@@ -39463,10 +39331,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
-	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -39489,7 +39357,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -39502,7 +39370,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -39510,7 +39378,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -39523,9 +39391,9 @@
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+		   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+		   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -39539,13 +39407,13 @@
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.62,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -39553,12 +39421,11 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -39580,36 +39447,30 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
+    { echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
+  -*) { echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -39628,29 +39489,27 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
   export CONFIG_SHELL
-  exec "\$@"
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 #
 # INIT-COMMANDS
 #
@@ -39658,7 +39517,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -39669,8 +39528,8 @@
     "digikam/utilities/hotplug/digikam-download.desktop") CONFIG_FILES="$CONFIG_FILES digikam/utilities/hotplug/digikam-download.desktop" ;;
     "digikam/utilities/hotplug/digikam-gphoto2-camera.desktop") CONFIG_FILES="$CONFIG_FILES digikam/utilities/hotplug/digikam-gphoto2-camera.desktop" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -39711,143 +39570,421 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
 if test -n "$CONFIG_FILES"; then
 
+_ACEOF
 
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+KDECONFIG!$KDECONFIG$ac_delim
+kde_libs_prefix!$kde_libs_prefix$ac_delim
+kde_libs_htmldir!$kde_libs_htmldir$ac_delim
+CONF_FILES!$CONF_FILES$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
 
 
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  cat >conf$$subs.sed <<_ACEOF
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
+unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
+unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
+USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
+USE_RTTI!$USE_RTTI$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
+NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
+ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
+LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
+LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
+KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
+KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
+KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
+KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
+KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
+KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
+KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+KDE_PLUGIN!$KDE_PLUGIN$ac_delim
+KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+LIBUTIL!$LIBUTIL$ac_delim
+LIBCOMPAT!$LIBCOMPAT$ac_delim
+LIBCRYPT!$LIBCRYPT$ac_delim
+LIBRESOLV!$LIBRESOLV$ac_delim
+LIB_POLL!$LIB_POLL$ac_delim
+FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
+LIBSOCKET!$LIBSOCKET$ac_delim
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+LIBUCB!$LIBUCB$ac_delim
+LIBDL!$LIBDL$ac_delim
+KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
+KDE_USE_PIE!$KDE_USE_PIE$ac_delim
+include_x11_TRUE!$include_x11_TRUE$ac_delim
+include_x11_FALSE!$include_x11_FALSE$ac_delim
+XMKMF!$XMKMF$ac_delim
+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
+LIB_X11!$LIB_X11$ac_delim
+LIB_XRENDER!$LIB_XRENDER$ac_delim
+LIBSM!$LIBSM$ac_delim
+X_INCLUDES!$X_INCLUDES$ac_delim
+X_LDFLAGS!$X_LDFLAGS$ac_delim
+x_includes!$x_includes$ac_delim
+x_libraries!$x_libraries$ac_delim
+QTE_NORTTI!$QTE_NORTTI$ac_delim
+LIB_XEXT!$LIB_XEXT$ac_delim
+LIBPTHREAD!$LIBPTHREAD$ac_delim
+USE_THREADS!$USE_THREADS$ac_delim
+KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
+KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
+USER_INCLUDES!$USER_INCLUDES$ac_delim
+USER_LDFLAGS!$USER_LDFLAGS$ac_delim
+LIBZ!$LIBZ$ac_delim
+LIBPNG!$LIBPNG$ac_delim
+LIBJPEG!$LIBJPEG$ac_delim
+qt_libraries!$qt_libraries$ac_delim
+qt_includes!$qt_includes$ac_delim
+QT_INCLUDES!$QT_INCLUDES$ac_delim
+QT_LDFLAGS!$QT_LDFLAGS$ac_delim
+PERL!$PERL$ac_delim
+MOC!$MOC$ac_delim
+UIC!$UIC$ac_delim
+UIC_TR!$UIC_TR$ac_delim
+LIB_QT!$LIB_QT$ac_delim
+LIB_QPE!$LIB_QPE$ac_delim
+kde_qtver!$kde_qtver$ac_delim
+KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
+KDE_RPATH!$KDE_RPATH$ac_delim
+X_RPATH!$X_RPATH$ac_delim
+kde_libraries!$kde_libraries$ac_delim
+kde_includes!$kde_includes$ac_delim
+KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
+KDE_INCLUDES!$KDE_INCLUDES$ac_delim
+all_includes!$all_includes$ac_delim
+all_libraries!$all_libraries$ac_delim
+AUTODIRS!$AUTODIRS$ac_delim
+include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
+include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
+MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+DCOPIDLNG!$DCOPIDLNG$ac_delim
+_ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
-rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
 
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+DCOPIDL!$DCOPIDL$ac_delim
+DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
+DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
+MCOPIDL!$MCOPIDL$ac_delim
+ARTSCCONFIG!$ARTSCCONFIG$ac_delim
+MEINPROC!$MEINPROC$ac_delim
+KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
+XMLLINT!$XMLLINT$ac_delim
+kde_htmldir!$kde_htmldir$ac_delim
+kde_appsdir!$kde_appsdir$ac_delim
+kde_icondir!$kde_icondir$ac_delim
+kde_sounddir!$kde_sounddir$ac_delim
+kde_datadir!$kde_datadir$ac_delim
+kde_locale!$kde_locale$ac_delim
+kde_confdir!$kde_confdir$ac_delim
+kde_kcfgdir!$kde_kcfgdir$ac_delim
+kde_mimedir!$kde_mimedir$ac_delim
+kde_wallpaperdir!$kde_wallpaperdir$ac_delim
+kde_bindir!$kde_bindir$ac_delim
+xdg_appsdir!$xdg_appsdir$ac_delim
+xdg_menudir!$xdg_menudir$ac_delim
+xdg_directorydir!$xdg_directorydir$ac_delim
+kde_templatesdir!$kde_templatesdir$ac_delim
+kde_servicesdir!$kde_servicesdir$ac_delim
+kde_servicetypesdir!$kde_servicetypesdir$ac_delim
+kde_moduledir!$kde_moduledir$ac_delim
+kdeinitdir!$kdeinitdir$ac_delim
+kde_styledir!$kde_styledir$ac_delim
+kde_widgetdir!$kde_widgetdir$ac_delim
+LIB_KDED!$LIB_KDED$ac_delim
+LIB_KDECORE!$LIB_KDECORE$ac_delim
+LIB_KDEUI!$LIB_KDEUI$ac_delim
+LIB_KIO!$LIB_KIO$ac_delim
+LIB_KJS!$LIB_KJS$ac_delim
+LIB_SMB!$LIB_SMB$ac_delim
+LIB_KAB!$LIB_KAB$ac_delim
+LIB_KABC!$LIB_KABC$ac_delim
+LIB_KHTML!$LIB_KHTML$ac_delim
+LIB_KSPELL!$LIB_KSPELL$ac_delim
+LIB_KPARTS!$LIB_KPARTS$ac_delim
+LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
+LIB_KUTILS!$LIB_KUTILS$ac_delim
+LIB_KDEPIM!$LIB_KDEPIM$ac_delim
+LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
+LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
+LIB_KDNSSD!$LIB_KDNSSD$ac_delim
+LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
+LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
+LIB_KFILE!$LIB_KFILE$ac_delim
+LIB_KFM!$LIB_KFM$ac_delim
+LIB_ARTS!$LIB_ARTS$ac_delim
+QTDOCDIR!$QTDOCDIR$ac_delim
+KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
+DOXYGEN!$DOXYGEN$ac_delim
+DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
+DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
+KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
+PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim
+LCMS_LIBS!$LCMS_LIBS$ac_delim
+GPHOTO_CONFIG!$GPHOTO_CONFIG$ac_delim
+GPHOTO_PORT_CONFIG!$GPHOTO_PORT_CONFIG$ac_delim
+GPHOTO_CFLAGS!$GPHOTO_CFLAGS$ac_delim
+LIB_GPHOTO!$LIB_GPHOTO$ac_delim
+LIBKIPI_CFLAGS!$LIBKIPI_CFLAGS$ac_delim
+LIBKIPI_LIBS!$LIBKIPI_LIBS$ac_delim
+LIBKEXIV2_CFLAGS!$LIBKEXIV2_CFLAGS$ac_delim
+LIBKEXIV2_LIBS!$LIBKEXIV2_LIBS$ac_delim
+LIBKDCRAW_CFLAGS!$LIBKDCRAW_CFLAGS$ac_delim
+LIBKDCRAW_LIBS!$LIBKDCRAW_LIBS$ac_delim
+LIB_TIFF!$LIB_TIFF$ac_delim
+LIB_PNG!$LIB_PNG$ac_delim
+LIB_JASPER!$LIB_JASPER$ac_delim
+SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
+SQLITE_LIBS!$SQLITE_LIBS$ac_delim
+LIB_SQLITE3!$LIB_SQLITE3$ac_delim
+with_included_sqlite3_TRUE!$with_included_sqlite3_TRUE$ac_delim
+with_included_sqlite3_FALSE!$with_included_sqlite3_FALSE$ac_delim
+digikamhelper_dir!$digikamhelper_dir$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
 _ACEOF
 
+
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -39863,133 +40000,19 @@
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 fi # test -n "$CONFIG_FILES"
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
 
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", line, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -40018,38 +40041,26 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      ac_file_inputs="$ac_file_inputs $ac_f"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
     fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$tmp/stdin";;
     esac
     ;;
   esac
@@ -40059,7 +40070,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -40085,7 +40096,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -40094,7 +40105,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -40115,17 +40126,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -40170,13 +40181,12 @@
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-ac_sed_dataroot='
-/datarootdir/ {
+case `sed -n '/datarootdir/ {
   p
   q
 }
@@ -40185,14 +40195,13 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+' $ac_file_inputs` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -40206,16 +40215,15 @@
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -40226,60 +40234,121 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      rm -f $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
+  rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -40294,7 +40363,7 @@
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -40314,8 +40383,8 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -40337,7 +40406,7 @@
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -40381,7 +40450,7 @@
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
+echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -40407,7 +40476,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -40416,7 +40485,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -40437,8 +40506,8 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -40452,19 +40521,9 @@
 
 { (exit 0); exit 0; }
 _ACEOF
-if test "x$with_fast_perl" = "xyes"; then    
-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
-  rm -f $CONFIG_STATUS.bak
-fi    
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -40486,10 +40545,6 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
 
 ac_config_files="$ac_config_files digikam/utilities/hotplug/digikam-mount-and-download.desktop"
 
@@ -40520,12 +40575,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -40558,12 +40612,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -40579,7 +40633,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -40591,62 +40645,61 @@
 
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${unsermake_enable_pch_TRUE}" && test -z "${unsermake_enable_pch_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
+echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_x11_TRUE}" && test -z "${include_x11_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_x11\" was never defined.
+echo "$as_me: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_ARTS\" was never defined.
+echo "$as_me: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${with_included_sqlite3_TRUE}" && test -z "${with_included_sqlite3_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
+echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -40659,7 +40712,7 @@
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -40669,7 +40722,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -40691,45 +40744,17 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Support unset when possible.
@@ -40745,6 +40770,8 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -40767,7 +40794,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -40780,10 +40807,17 @@
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -40805,7 +40839,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -40856,7 +40890,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -40884,6 +40918,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -40896,22 +40931,19 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
@@ -40936,10 +40968,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
-	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -40962,7 +40994,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -40975,7 +41007,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -40983,7 +41015,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -40996,9 +41028,9 @@
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+		   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+		   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -41012,13 +41044,13 @@
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.62,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -41026,12 +41058,11 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -41053,36 +41084,30 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
+    { echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
+  -*) { echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -41101,29 +41126,27 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
   export CONFIG_SHELL
-  exec "\$@"
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 #
 # INIT-COMMANDS
 #
@@ -41131,7 +41154,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -41143,8 +41166,8 @@
     "digikam/utilities/hotplug/digikam-gphoto2-camera.desktop") CONFIG_FILES="$CONFIG_FILES digikam/utilities/hotplug/digikam-gphoto2-camera.desktop" ;;
     "digikam/utilities/hotplug/digikam-mount-and-download.desktop") CONFIG_FILES="$CONFIG_FILES digikam/utilities/hotplug/digikam-mount-and-download.desktop" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -41185,143 +41208,421 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
 if test -n "$CONFIG_FILES"; then
 
+_ACEOF
 
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+KDECONFIG!$KDECONFIG$ac_delim
+kde_libs_prefix!$kde_libs_prefix$ac_delim
+kde_libs_htmldir!$kde_libs_htmldir$ac_delim
+CONF_FILES!$CONF_FILES$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
 
 
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  cat >conf$$subs.sed <<_ACEOF
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
+unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
+unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
+USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
+USE_RTTI!$USE_RTTI$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
+NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
+ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
+LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
+LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
+KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
+KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
+KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
+KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
+KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
+KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
+KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+KDE_PLUGIN!$KDE_PLUGIN$ac_delim
+KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+LIBUTIL!$LIBUTIL$ac_delim
+LIBCOMPAT!$LIBCOMPAT$ac_delim
+LIBCRYPT!$LIBCRYPT$ac_delim
+LIBRESOLV!$LIBRESOLV$ac_delim
+LIB_POLL!$LIB_POLL$ac_delim
+FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
+LIBSOCKET!$LIBSOCKET$ac_delim
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+LIBUCB!$LIBUCB$ac_delim
+LIBDL!$LIBDL$ac_delim
+KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
+KDE_USE_PIE!$KDE_USE_PIE$ac_delim
+include_x11_TRUE!$include_x11_TRUE$ac_delim
+include_x11_FALSE!$include_x11_FALSE$ac_delim
+XMKMF!$XMKMF$ac_delim
+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
+LIB_X11!$LIB_X11$ac_delim
+LIB_XRENDER!$LIB_XRENDER$ac_delim
+LIBSM!$LIBSM$ac_delim
+X_INCLUDES!$X_INCLUDES$ac_delim
+X_LDFLAGS!$X_LDFLAGS$ac_delim
+x_includes!$x_includes$ac_delim
+x_libraries!$x_libraries$ac_delim
+QTE_NORTTI!$QTE_NORTTI$ac_delim
+LIB_XEXT!$LIB_XEXT$ac_delim
+LIBPTHREAD!$LIBPTHREAD$ac_delim
+USE_THREADS!$USE_THREADS$ac_delim
+KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
+KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
+USER_INCLUDES!$USER_INCLUDES$ac_delim
+USER_LDFLAGS!$USER_LDFLAGS$ac_delim
+LIBZ!$LIBZ$ac_delim
+LIBPNG!$LIBPNG$ac_delim
+LIBJPEG!$LIBJPEG$ac_delim
+qt_libraries!$qt_libraries$ac_delim
+qt_includes!$qt_includes$ac_delim
+QT_INCLUDES!$QT_INCLUDES$ac_delim
+QT_LDFLAGS!$QT_LDFLAGS$ac_delim
+PERL!$PERL$ac_delim
+MOC!$MOC$ac_delim
+UIC!$UIC$ac_delim
+UIC_TR!$UIC_TR$ac_delim
+LIB_QT!$LIB_QT$ac_delim
+LIB_QPE!$LIB_QPE$ac_delim
+kde_qtver!$kde_qtver$ac_delim
+KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
+KDE_RPATH!$KDE_RPATH$ac_delim
+X_RPATH!$X_RPATH$ac_delim
+kde_libraries!$kde_libraries$ac_delim
+kde_includes!$kde_includes$ac_delim
+KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
+KDE_INCLUDES!$KDE_INCLUDES$ac_delim
+all_includes!$all_includes$ac_delim
+all_libraries!$all_libraries$ac_delim
+AUTODIRS!$AUTODIRS$ac_delim
+include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
+include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
+MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+DCOPIDLNG!$DCOPIDLNG$ac_delim
+_ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
-rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
 
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+DCOPIDL!$DCOPIDL$ac_delim
+DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
+DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
+MCOPIDL!$MCOPIDL$ac_delim
+ARTSCCONFIG!$ARTSCCONFIG$ac_delim
+MEINPROC!$MEINPROC$ac_delim
+KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
+XMLLINT!$XMLLINT$ac_delim
+kde_htmldir!$kde_htmldir$ac_delim
+kde_appsdir!$kde_appsdir$ac_delim
+kde_icondir!$kde_icondir$ac_delim
+kde_sounddir!$kde_sounddir$ac_delim
+kde_datadir!$kde_datadir$ac_delim
+kde_locale!$kde_locale$ac_delim
+kde_confdir!$kde_confdir$ac_delim
+kde_kcfgdir!$kde_kcfgdir$ac_delim
+kde_mimedir!$kde_mimedir$ac_delim
+kde_wallpaperdir!$kde_wallpaperdir$ac_delim
+kde_bindir!$kde_bindir$ac_delim
+xdg_appsdir!$xdg_appsdir$ac_delim
+xdg_menudir!$xdg_menudir$ac_delim
+xdg_directorydir!$xdg_directorydir$ac_delim
+kde_templatesdir!$kde_templatesdir$ac_delim
+kde_servicesdir!$kde_servicesdir$ac_delim
+kde_servicetypesdir!$kde_servicetypesdir$ac_delim
+kde_moduledir!$kde_moduledir$ac_delim
+kdeinitdir!$kdeinitdir$ac_delim
+kde_styledir!$kde_styledir$ac_delim
+kde_widgetdir!$kde_widgetdir$ac_delim
+LIB_KDED!$LIB_KDED$ac_delim
+LIB_KDECORE!$LIB_KDECORE$ac_delim
+LIB_KDEUI!$LIB_KDEUI$ac_delim
+LIB_KIO!$LIB_KIO$ac_delim
+LIB_KJS!$LIB_KJS$ac_delim
+LIB_SMB!$LIB_SMB$ac_delim
+LIB_KAB!$LIB_KAB$ac_delim
+LIB_KABC!$LIB_KABC$ac_delim
+LIB_KHTML!$LIB_KHTML$ac_delim
+LIB_KSPELL!$LIB_KSPELL$ac_delim
+LIB_KPARTS!$LIB_KPARTS$ac_delim
+LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
+LIB_KUTILS!$LIB_KUTILS$ac_delim
+LIB_KDEPIM!$LIB_KDEPIM$ac_delim
+LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
+LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
+LIB_KDNSSD!$LIB_KDNSSD$ac_delim
+LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
+LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
+LIB_KFILE!$LIB_KFILE$ac_delim
+LIB_KFM!$LIB_KFM$ac_delim
+LIB_ARTS!$LIB_ARTS$ac_delim
+QTDOCDIR!$QTDOCDIR$ac_delim
+KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
+DOXYGEN!$DOXYGEN$ac_delim
+DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
+DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
+KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
+PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim
+LCMS_LIBS!$LCMS_LIBS$ac_delim
+GPHOTO_CONFIG!$GPHOTO_CONFIG$ac_delim
+GPHOTO_PORT_CONFIG!$GPHOTO_PORT_CONFIG$ac_delim
+GPHOTO_CFLAGS!$GPHOTO_CFLAGS$ac_delim
+LIB_GPHOTO!$LIB_GPHOTO$ac_delim
+LIBKIPI_CFLAGS!$LIBKIPI_CFLAGS$ac_delim
+LIBKIPI_LIBS!$LIBKIPI_LIBS$ac_delim
+LIBKEXIV2_CFLAGS!$LIBKEXIV2_CFLAGS$ac_delim
+LIBKEXIV2_LIBS!$LIBKEXIV2_LIBS$ac_delim
+LIBKDCRAW_CFLAGS!$LIBKDCRAW_CFLAGS$ac_delim
+LIBKDCRAW_LIBS!$LIBKDCRAW_LIBS$ac_delim
+LIB_TIFF!$LIB_TIFF$ac_delim
+LIB_PNG!$LIB_PNG$ac_delim
+LIB_JASPER!$LIB_JASPER$ac_delim
+SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
+SQLITE_LIBS!$SQLITE_LIBS$ac_delim
+LIB_SQLITE3!$LIB_SQLITE3$ac_delim
+with_included_sqlite3_TRUE!$with_included_sqlite3_TRUE$ac_delim
+with_included_sqlite3_FALSE!$with_included_sqlite3_FALSE$ac_delim
+digikamhelper_dir!$digikamhelper_dir$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
 _ACEOF
 
+
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -41337,133 +41638,19 @@
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 fi # test -n "$CONFIG_FILES"
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
 
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", line, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -41492,38 +41679,26 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      ac_file_inputs="$ac_file_inputs $ac_f"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
     fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$tmp/stdin";;
     esac
     ;;
   esac
@@ -41533,7 +41708,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -41559,7 +41734,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -41568,7 +41743,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -41589,17 +41764,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -41644,13 +41819,12 @@
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-ac_sed_dataroot='
-/datarootdir/ {
+case `sed -n '/datarootdir/ {
   p
   q
 }
@@ -41659,14 +41833,13 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+' $ac_file_inputs` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -41680,16 +41853,15 @@
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -41700,60 +41872,121 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      rm -f $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
+  rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -41768,7 +42001,7 @@
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -41788,8 +42021,8 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -41811,7 +42044,7 @@
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -41855,7 +42088,7 @@
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
+echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -41881,7 +42114,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -41890,7 +42123,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -41911,8 +42144,8 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -41926,19 +42159,9 @@
 
 { (exit 0); exit 0; }
 _ACEOF
-if test "x$with_fast_perl" = "xyes"; then    
-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
-  rm -f $CONFIG_STATUS.bak
-fi    
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -41960,10 +42183,6 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
 
 
 
@@ -41987,8 +42206,8 @@
 fi
 
 for i in $ac_topsubdirs; do
-  { $as_echo "$as_me:$LINENO: checking if $i should be compiled" >&5
-$as_echo_n "checking if $i should be compiled... " >&6; }
+  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
   if test -d $srcdir/$i; then
     install_it="yes"
     for j in $DO_NOT_COMPILE; do
@@ -41999,8 +42218,8 @@
   else
     install_it="no"
   fi
-  { $as_echo "$as_me:$LINENO: result: $install_it" >&5
-$as_echo "$install_it" >&6; }
+  { echo "$as_me:$LINENO: result: $install_it" >&5
+echo "${ECHO_T}$install_it" >&6; }
   vari=`echo $i | sed -e 's,[-+.@],_,g'`
   if test $install_it = "yes"; then
     TOPSUBDIRS="$TOPSUBDIRS $i"
@@ -42335,12 +42554,11 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -42373,12 +42591,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
+echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -42394,7 +42612,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -42406,83 +42624,82 @@
 
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${unsermake_enable_pch_TRUE}" && test -z "${unsermake_enable_pch_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
+echo "$as_me: error: conditional \"unsermake_enable_pch\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_x11_TRUE}" && test -z "${include_x11_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_x11\" was never defined.
+echo "$as_me: error: conditional \"include_x11\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"include_ARTS\" was never defined.
+echo "$as_me: error: conditional \"include_ARTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${with_included_sqlite3_TRUE}" && test -z "${with_included_sqlite3_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
+echo "$as_me: error: conditional \"with_included_sqlite3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${digikam_SUBDIR_included_TRUE}" && test -z "${digikam_SUBDIR_included_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"digikam_SUBDIR_included\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"digikam_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"digikam_SUBDIR_included\" was never defined.
+echo "$as_me: error: conditional \"digikam_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${doc_SUBDIR_included_TRUE}" && test -z "${doc_SUBDIR_included_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"doc_SUBDIR_included\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"doc_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"doc_SUBDIR_included\" was never defined.
+echo "$as_me: error: conditional \"doc_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${po_SUBDIR_included_TRUE}" && test -z "${po_SUBDIR_included_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"po_SUBDIR_included\" was never defined.
+  { { echo "$as_me:$LINENO: error: conditional \"po_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"po_SUBDIR_included\" was never defined.
+echo "$as_me: error: conditional \"po_SUBDIR_included\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -42495,7 +42712,7 @@
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -42505,7 +42722,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -42527,45 +42744,17 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Support unset when possible.
@@ -42581,6 +42770,8 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
+as_nl='
+'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -42603,7 +42794,7 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -42616,10 +42807,17 @@
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+  fi
+done
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -42641,7 +42839,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -42692,7 +42890,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -42720,6 +42918,7 @@
 *)
   ECHO_N='-n';;
 esac
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -42732,22 +42931,19 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  mkdir conf$$.dir
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
@@ -42772,10 +42968,10 @@
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-	test -d "$1/.";
+        test -d "$1/.";
       else
 	case $1 in
-	-*)set "./$1";;
+        -*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -42798,7 +42994,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -42811,7 +43007,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -42819,7 +43015,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -42832,9 +43028,9 @@
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+		   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+		   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -42848,13 +43044,13 @@
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.62,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.61,
+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -42862,12 +43058,11 @@
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -42889,36 +43084,30 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
+    { echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
+  -*) { echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -42937,29 +43126,27 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  CONFIG_SHELL=$SHELL
   export CONFIG_SHELL
-  exec "\$@"
+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 #
 # INIT-COMMANDS
 #
@@ -42967,7 +43154,7 @@
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -43115,8 +43302,8 @@
     "po/zh_CN/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_CN/Makefile" ;;
     "po/zh_TW/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_TW/Makefile" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -43157,143 +43344,428 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   echo "$me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+#
+# Set up the sed scripts for CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
 if test -n "$CONFIG_FILES"; then
 
+_ACEOF
 
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+SHELL!$SHELL$ac_delim
+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+exec_prefix!$exec_prefix$ac_delim
+prefix!$prefix$ac_delim
+program_transform_name!$program_transform_name$ac_delim
+bindir!$bindir$ac_delim
+sbindir!$sbindir$ac_delim
+libexecdir!$libexecdir$ac_delim
+datarootdir!$datarootdir$ac_delim
+datadir!$datadir$ac_delim
+sysconfdir!$sysconfdir$ac_delim
+sharedstatedir!$sharedstatedir$ac_delim
+localstatedir!$localstatedir$ac_delim
+includedir!$includedir$ac_delim
+oldincludedir!$oldincludedir$ac_delim
+docdir!$docdir$ac_delim
+infodir!$infodir$ac_delim
+htmldir!$htmldir$ac_delim
+dvidir!$dvidir$ac_delim
+pdfdir!$pdfdir$ac_delim
+psdir!$psdir$ac_delim
+libdir!$libdir$ac_delim
+localedir!$localedir$ac_delim
+mandir!$mandir$ac_delim
+DEFS!$DEFS$ac_delim
+ECHO_C!$ECHO_C$ac_delim
+ECHO_N!$ECHO_N$ac_delim
+ECHO_T!$ECHO_T$ac_delim
+LIBS!$LIBS$ac_delim
+build_alias!$build_alias$ac_delim
+host_alias!$host_alias$ac_delim
+target_alias!$target_alias$ac_delim
+build!$build$ac_delim
+build_cpu!$build_cpu$ac_delim
+build_vendor!$build_vendor$ac_delim
+build_os!$build_os$ac_delim
+host!$host$ac_delim
+host_cpu!$host_cpu$ac_delim
+host_vendor!$host_vendor$ac_delim
+host_os!$host_os$ac_delim
+target!$target$ac_delim
+target_cpu!$target_cpu$ac_delim
+target_vendor!$target_vendor$ac_delim
+target_os!$target_os$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
+ACLOCAL!$ACLOCAL$ac_delim
+AUTOCONF!$AUTOCONF$ac_delim
+AUTOMAKE!$AUTOMAKE$ac_delim
+AUTOHEADER!$AUTOHEADER$ac_delim
+MAKEINFO!$MAKEINFO$ac_delim
+install_sh!$install_sh$ac_delim
+STRIP!$STRIP$ac_delim
+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
+AWK!$AWK$ac_delim
+SET_MAKE!$SET_MAKE$ac_delim
+am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
+KDECONFIG!$KDECONFIG$ac_delim
+kde_libs_prefix!$kde_libs_prefix$ac_delim
+kde_libs_htmldir!$kde_libs_htmldir$ac_delim
+CONF_FILES!$CONF_FILES$ac_delim
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
+DEPDIR!$DEPDIR$ac_delim
+am__include!$am__include$ac_delim
+am__quote!$am__quote$ac_delim
+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+CCDEPMODE!$CCDEPMODE$ac_delim
+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+CPP!$CPP$ac_delim
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
 
 
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  cat >conf$$subs.sed <<_ACEOF
+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
+unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
+unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
+USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
+USE_RTTI!$USE_RTTI$ac_delim
+CXXCPP!$CXXCPP$ac_delim
+NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
+NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
+ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
+LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
+LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
+KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
+KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
+KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
+KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
+KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
+KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
+KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
+GREP!$GREP$ac_delim
+EGREP!$EGREP$ac_delim
+LN_S!$LN_S$ac_delim
+ECHO!$ECHO$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+F77!$F77$ac_delim
+FFLAGS!$FFLAGS$ac_delim
+ac_ct_F77!$ac_ct_F77$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+KDE_PLUGIN!$KDE_PLUGIN$ac_delim
+KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
+MSGFMT!$MSGFMT$ac_delim
+GMSGFMT!$GMSGFMT$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+LIBUTIL!$LIBUTIL$ac_delim
+LIBCOMPAT!$LIBCOMPAT$ac_delim
+LIBCRYPT!$LIBCRYPT$ac_delim
+LIBRESOLV!$LIBRESOLV$ac_delim
+LIB_POLL!$LIB_POLL$ac_delim
+FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
+LIBSOCKET!$LIBSOCKET$ac_delim
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+LIBUCB!$LIBUCB$ac_delim
+LIBDL!$LIBDL$ac_delim
+KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
+KDE_USE_PIE!$KDE_USE_PIE$ac_delim
+include_x11_TRUE!$include_x11_TRUE$ac_delim
+include_x11_FALSE!$include_x11_FALSE$ac_delim
+XMKMF!$XMKMF$ac_delim
+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
+LIB_X11!$LIB_X11$ac_delim
+LIB_XRENDER!$LIB_XRENDER$ac_delim
+LIBSM!$LIBSM$ac_delim
+X_INCLUDES!$X_INCLUDES$ac_delim
+X_LDFLAGS!$X_LDFLAGS$ac_delim
+x_includes!$x_includes$ac_delim
+x_libraries!$x_libraries$ac_delim
+QTE_NORTTI!$QTE_NORTTI$ac_delim
+LIB_XEXT!$LIB_XEXT$ac_delim
+LIBPTHREAD!$LIBPTHREAD$ac_delim
+USE_THREADS!$USE_THREADS$ac_delim
+KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
+KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
+USER_INCLUDES!$USER_INCLUDES$ac_delim
+USER_LDFLAGS!$USER_LDFLAGS$ac_delim
+LIBZ!$LIBZ$ac_delim
+LIBPNG!$LIBPNG$ac_delim
+LIBJPEG!$LIBJPEG$ac_delim
+qt_libraries!$qt_libraries$ac_delim
+qt_includes!$qt_includes$ac_delim
+QT_INCLUDES!$QT_INCLUDES$ac_delim
+QT_LDFLAGS!$QT_LDFLAGS$ac_delim
+PERL!$PERL$ac_delim
+MOC!$MOC$ac_delim
+UIC!$UIC$ac_delim
+UIC_TR!$UIC_TR$ac_delim
+LIB_QT!$LIB_QT$ac_delim
+LIB_QPE!$LIB_QPE$ac_delim
+kde_qtver!$kde_qtver$ac_delim
+KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
+KDE_RPATH!$KDE_RPATH$ac_delim
+X_RPATH!$X_RPATH$ac_delim
+kde_libraries!$kde_libraries$ac_delim
+kde_includes!$kde_includes$ac_delim
+KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
+KDE_INCLUDES!$KDE_INCLUDES$ac_delim
+all_includes!$all_includes$ac_delim
+all_libraries!$all_libraries$ac_delim
+AUTODIRS!$AUTODIRS$ac_delim
+include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
+include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
+MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+DCOPIDLNG!$DCOPIDLNG$ac_delim
+_ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
-rm -f conf$$subs.sh
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
 _ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
 
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
+DCOPIDL!$DCOPIDL$ac_delim
+DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
+DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
+MCOPIDL!$MCOPIDL$ac_delim
+ARTSCCONFIG!$ARTSCCONFIG$ac_delim
+MEINPROC!$MEINPROC$ac_delim
+KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
+XMLLINT!$XMLLINT$ac_delim
+kde_htmldir!$kde_htmldir$ac_delim
+kde_appsdir!$kde_appsdir$ac_delim
+kde_icondir!$kde_icondir$ac_delim
+kde_sounddir!$kde_sounddir$ac_delim
+kde_datadir!$kde_datadir$ac_delim
+kde_locale!$kde_locale$ac_delim
+kde_confdir!$kde_confdir$ac_delim
+kde_kcfgdir!$kde_kcfgdir$ac_delim
+kde_mimedir!$kde_mimedir$ac_delim
+kde_wallpaperdir!$kde_wallpaperdir$ac_delim
+kde_bindir!$kde_bindir$ac_delim
+xdg_appsdir!$xdg_appsdir$ac_delim
+xdg_menudir!$xdg_menudir$ac_delim
+xdg_directorydir!$xdg_directorydir$ac_delim
+kde_templatesdir!$kde_templatesdir$ac_delim
+kde_servicesdir!$kde_servicesdir$ac_delim
+kde_servicetypesdir!$kde_servicetypesdir$ac_delim
+kde_moduledir!$kde_moduledir$ac_delim
+kdeinitdir!$kdeinitdir$ac_delim
+kde_styledir!$kde_styledir$ac_delim
+kde_widgetdir!$kde_widgetdir$ac_delim
+LIB_KDED!$LIB_KDED$ac_delim
+LIB_KDECORE!$LIB_KDECORE$ac_delim
+LIB_KDEUI!$LIB_KDEUI$ac_delim
+LIB_KIO!$LIB_KIO$ac_delim
+LIB_KJS!$LIB_KJS$ac_delim
+LIB_SMB!$LIB_SMB$ac_delim
+LIB_KAB!$LIB_KAB$ac_delim
+LIB_KABC!$LIB_KABC$ac_delim
+LIB_KHTML!$LIB_KHTML$ac_delim
+LIB_KSPELL!$LIB_KSPELL$ac_delim
+LIB_KPARTS!$LIB_KPARTS$ac_delim
+LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
+LIB_KUTILS!$LIB_KUTILS$ac_delim
+LIB_KDEPIM!$LIB_KDEPIM$ac_delim
+LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
+LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
+LIB_KDNSSD!$LIB_KDNSSD$ac_delim
+LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
+LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
+LIB_KFILE!$LIB_KFILE$ac_delim
+LIB_KFM!$LIB_KFM$ac_delim
+LIB_ARTS!$LIB_ARTS$ac_delim
+QTDOCDIR!$QTDOCDIR$ac_delim
+KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
+DOXYGEN!$DOXYGEN$ac_delim
+DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
+DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
+KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
+PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim
+LCMS_LIBS!$LCMS_LIBS$ac_delim
+GPHOTO_CONFIG!$GPHOTO_CONFIG$ac_delim
+GPHOTO_PORT_CONFIG!$GPHOTO_PORT_CONFIG$ac_delim
+GPHOTO_CFLAGS!$GPHOTO_CFLAGS$ac_delim
+LIB_GPHOTO!$LIB_GPHOTO$ac_delim
+LIBKIPI_CFLAGS!$LIBKIPI_CFLAGS$ac_delim
+LIBKIPI_LIBS!$LIBKIPI_LIBS$ac_delim
+LIBKEXIV2_CFLAGS!$LIBKEXIV2_CFLAGS$ac_delim
+LIBKEXIV2_LIBS!$LIBKEXIV2_LIBS$ac_delim
+LIBKDCRAW_CFLAGS!$LIBKDCRAW_CFLAGS$ac_delim
+LIBKDCRAW_LIBS!$LIBKDCRAW_LIBS$ac_delim
+LIB_TIFF!$LIB_TIFF$ac_delim
+LIB_PNG!$LIB_PNG$ac_delim
+LIB_JASPER!$LIB_JASPER$ac_delim
+SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
+SQLITE_LIBS!$SQLITE_LIBS$ac_delim
+LIB_SQLITE3!$LIB_SQLITE3$ac_delim
+with_included_sqlite3_TRUE!$with_included_sqlite3_TRUE$ac_delim
+with_included_sqlite3_FALSE!$with_included_sqlite3_FALSE$ac_delim
+digikamhelper_dir!$digikamhelper_dir$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+TOPSUBDIRS!$TOPSUBDIRS$ac_delim
+digikam_SUBDIR_included_TRUE!$digikam_SUBDIR_included_TRUE$ac_delim
+digikam_SUBDIR_included_FALSE!$digikam_SUBDIR_included_FALSE$ac_delim
+doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
+doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
+po_SUBDIR_included_TRUE!$po_SUBDIR_included_TRUE$ac_delim
+po_SUBDIR_included_FALSE!$po_SUBDIR_included_FALSE$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
+CEOF$ac_eof
 _ACEOF
 
+
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -43309,133 +43781,19 @@
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 fi # test -n "$CONFIG_FILES"
 
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", line, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -43464,38 +43822,26 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      ac_file_inputs="$ac_file_inputs $ac_f"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
+    configure_input="Generated from "`IFS=:
+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
     fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+    *:-:* | *:-) cat >"$tmp/stdin";;
     esac
     ;;
   esac
@@ -43505,7 +43851,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -43531,7 +43877,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -43540,7 +43886,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -43561,17 +43907,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -43616,13 +43962,12 @@
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-ac_sed_dataroot='
-/datarootdir/ {
+case `sed -n '/datarootdir/ {
   p
   q
 }
@@ -43631,14 +43976,13 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+' $ac_file_inputs` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -43652,16 +43996,15 @@
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
+s&@configure_input@&$configure_input&;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -43672,60 +44015,121 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  -) cat "$tmp/out"; rm -f "$tmp/out";;
+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+  esac
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
+
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      rm -f $ac_file
+      mv "$tmp/config.h" $ac_file
     fi
   else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+    echo "/* $configure_input  */"
+    cat "$ac_result"
   fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
+  rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -43740,7 +44144,7 @@
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -43760,8 +44164,8 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
+echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -43783,7 +44187,7 @@
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -43827,7 +44231,7 @@
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
+echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -43853,7 +44257,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -43862,7 +44266,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -43883,8 +44287,8 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -43898,19 +44302,9 @@
 
 { (exit 0); exit 0; }
 _ACEOF
-if test "x$with_fast_perl" = "xyes"; then    
-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
-  rm -f $CONFIG_STATUS.bak
-fi    
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -43932,10 +44326,6 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
 
 
 echo ""
--- digikam-0.9.4.orig/doc/Makefile.in
+++ digikam-0.9.4/doc/Makefile.in
@@ -678,6 +678,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/vi/Makefile.in
+++ digikam-0.9.4/po/vi/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/nb/Makefile.in
+++ digikam-0.9.4/po/nb/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/br/Makefile.in
+++ digikam-0.9.4/po/br/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/cs/Makefile.in
+++ digikam-0.9.4/po/cs/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/el/Makefile.in
+++ digikam-0.9.4/po/el/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/bg/Makefile.in
+++ digikam-0.9.4/po/bg/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/gl/Makefile.in
+++ digikam-0.9.4/po/gl/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/sr/Makefile.in
+++ digikam-0.9.4/po/sr/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/nn/Makefile.in
+++ digikam-0.9.4/po/nn/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/it/Makefile.in
+++ digikam-0.9.4/po/it/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/zh_CN/Makefile.in
+++ digikam-0.9.4/po/zh_CN/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/sl/Makefile.in
+++ digikam-0.9.4/po/sl/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/nds/Makefile.in
+++ digikam-0.9.4/po/nds/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/hu/Makefile.in
+++ digikam-0.9.4/po/hu/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/nl/Makefile.in
+++ digikam-0.9.4/po/nl/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ms/Makefile.in
+++ digikam-0.9.4/po/ms/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ca/Makefile.in
+++ digikam-0.9.4/po/ca/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/fi/Makefile.in
+++ digikam-0.9.4/po/fi/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ar/Makefile.in
+++ digikam-0.9.4/po/ar/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/fa/Makefile.in
+++ digikam-0.9.4/po/fa/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/sv/Makefile.in
+++ digikam-0.9.4/po/sv/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/pa/Makefile.in
+++ digikam-0.9.4/po/pa/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/en_GB/Makefile.in
+++ digikam-0.9.4/po/en_GB/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/cy/Makefile.in
+++ digikam-0.9.4/po/cy/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/rw/Makefile.in
+++ digikam-0.9.4/po/rw/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ka/Makefile.in
+++ digikam-0.9.4/po/ka/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/de/Makefile.in
+++ digikam-0.9.4/po/de/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/da/Makefile.in
+++ digikam-0.9.4/po/da/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/mt/Makefile.in
+++ digikam-0.9.4/po/mt/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/pl/Makefile.in
+++ digikam-0.9.4/po/pl/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/tr/Makefile.in
+++ digikam-0.9.4/po/tr/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/pt_BR/Makefile.in
+++ digikam-0.9.4/po/pt_BR/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/th/Makefile.in
+++ digikam-0.9.4/po/th/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/es/Makefile.in
+++ digikam-0.9.4/po/es/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/lt/Makefile.in
+++ digikam-0.9.4/po/lt/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/Makefile.in
+++ digikam-0.9.4/po/Makefile.in
@@ -340,7 +340,7 @@
 xdg_menudir = @xdg_menudir@
 #>- SUBDIRS = $(AUTODIRS)
 #>+ 1
-SUBDIRS =. nn mk rw de nds pt_BR ro he pl ar ta nl br es nb sr@Latn gl et sr bg fa pa fi sv el is mt ms it zh_TW tr pt zh_CN lt sl th ka ja cs cy fr vi uk sk hu da en_GB ru ca
+SUBDIRS =. vi nb br cs el bg gl sr nn it zh_CN sl nds hu nl ms ca fi ar fa sv pa en_GB cy rw ka de da mt pl tr pt_BR th es lt sk ru zh_TW he mk ro is pt fr sr@Latn ja et ta uk
 #>- all: all-recursive
 #>+ 1
 all: docs-am  all-recursive
@@ -676,6 +676,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/sk/Makefile.in
+++ digikam-0.9.4/po/sk/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ru/Makefile.in
+++ digikam-0.9.4/po/ru/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/zh_TW/Makefile.in
+++ digikam-0.9.4/po/zh_TW/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/he/Makefile.in
+++ digikam-0.9.4/po/he/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/mk/Makefile.in
+++ digikam-0.9.4/po/mk/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ro/Makefile.in
+++ digikam-0.9.4/po/ro/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/is/Makefile.in
+++ digikam-0.9.4/po/is/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/pt/Makefile.in
+++ digikam-0.9.4/po/pt/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/fr/Makefile.in
+++ digikam-0.9.4/po/fr/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/sr@Latn/Makefile.in
+++ digikam-0.9.4/po/sr@Latn/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ja/Makefile.in
+++ digikam-0.9.4/po/ja/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/et/Makefile.in
+++ digikam-0.9.4/po/et/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/ta/Makefile.in
+++ digikam-0.9.4/po/ta/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/po/uk/Makefile.in
+++ digikam-0.9.4/po/uk/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam.po Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/debian/rules
+++ digikam-0.9.4/debian/rules
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/kde.mk
+-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
+
+TARBALL_EXT=tar.bz2
+
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
+DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
+        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+    else
+        cdbs_kde_enable_final =
+    endif
+endif
+
+install/digikam::
+	install -D -o root -g root -m 0644 debian/lintian $(CURDIR)/debian/digikam/usr/share/lintian/overrides/digikam
+
+	# Icon 32x32 digikam/digikam/pics/cr32-app-digikam.png digikam.xpm
+	# Icon 16x16 digikam/digikam/pics/cr16-app-digikam.png digikam-16.xpm
+	install -D -p -m 0644 debian/xpm.d/digikam.xpm $(CURDIR)/debian/digikam/usr/share/pixmaps/digikam.xpm
+	install -D -p -m 0644 debian/xpm.d/digikam-16.xpm $(CURDIR)/debian/digikam/usr/share/pixmaps/digikam-16.xpm
+
+	# remove empty API-docs dirs tree
+	rm -rf $(CURDIR)/debian/digikam/usr/share/doc/kde
+
+install/showfoto::
+	# Icon 32x32 digikam/showfoto/cr32-app-showfoto.png showfoto.xpm
+	# Icon 16x16 digikam/showfoto/cr16-app-showfoto.png showfoto-16.xpm
+	install -D -p -m 0644 debian/xpm.d/showfoto.xpm $(CURDIR)/debian/showfoto/usr/share/pixmaps/showfoto.xpm
+	install -D -p -m 0644 debian/xpm.d/showfoto-16.xpm $(CURDIR)/debian/showfoto/usr/share/pixmaps/showfoto-16.xpm
+
+clean::
+	rm -f po/*/*.gmo
+
--- digikam-0.9.4.orig/debian/patches/10-sqlite-version.patch
+++ digikam-0.9.4/debian/patches/10-sqlite-version.patch
@@ -0,0 +1,51 @@
+--- digikam-0.9.4/configure.in	2008-07-16 21:05:58.000000000 +0200
++++ digikam-0.9.4/configure.in	2008-09-22 13:00:29.000000000 +0200
+@@ -393,7 +393,7 @@
+ 
+ if test x$included_sqlite3 = xno; then
+     if test x$PKGCONFIGFOUND = xyes; then
+-        PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.5, have_sqlite3=yes,have_sqlite3=no)
++        PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.4.2, have_sqlite3=yes,have_sqlite3=no)
+ 
+         if test x$have_sqlite3 = xyes; then
+             ## AC_DEFINE(HAVE_SQLITE3, 1, [have SQLite3 database library])
+--- digikam-0.9.4/configure	2008-07-16 21:06:18.000000000 +0200
++++ digikam-0.9.4/configure	2008-09-22 13:00:29.000000000 +0200
+@@ -37339,23 +37339,23 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        { $as_echo "$as_me:$LINENO: checking for sqlite3 >= 3.5" >&5
+-$as_echo_n "checking for sqlite3 >= 3.5... " >&6; }
++        { $as_echo "$as_me:$LINENO: checking for sqlite3 >= 3.4.2" >&5
++$as_echo_n "checking for sqlite3 >= 3.4.2... " >&6; }
+ 
+-        if $PKG_CONFIG --exists "sqlite3 >= 3.5" ; then
++        if $PKG_CONFIG --exists "sqlite3 >= 3.4.2" ; then
+             { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+             succeeded=yes
+ 
+             { $as_echo "$as_me:$LINENO: checking SQLITE_CFLAGS" >&5
+ $as_echo_n "checking SQLITE_CFLAGS... " >&6; }
+-            SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.5"`
++            SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.4.2"`
+             { $as_echo "$as_me:$LINENO: result: $SQLITE_CFLAGS" >&5
+ $as_echo "$SQLITE_CFLAGS" >&6; }
+ 
+             { $as_echo "$as_me:$LINENO: checking SQLITE_LIBS" >&5
+ $as_echo_n "checking SQLITE_LIBS... " >&6; }
+-            SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.5"`
++            SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.4.2"`
+             { $as_echo "$as_me:$LINENO: result: $SQLITE_LIBS" >&5
+ $as_echo "$SQLITE_LIBS" >&6; }
+         else
+@@ -37363,7 +37363,7 @@
+             SQLITE_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.5"`
++            SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.4.2"`
+ 
+         fi
+ 
--- digikam-0.9.4.orig/debian/copyright
+++ digikam-0.9.4/debian/copyright
@@ -0,0 +1,304 @@
+This package was debianized by Renchi Raju <renchi@green.tam.uiuc.edu>
+in 2002.  Later updated by Achim Bohnet <ach@mpe.mpg.de> and Paul Telford
+<pxt@debian.org>.
+
+Debian packagers:
+  © 2002 Renchi Raju Renchi Raju <renchi at pooh.tam.uiuc.edu>
+  © 2003,2004 Paul Telford <pxt at debian.org>
+  © 2003,2004,2005,2006 Achim Bohnet <ach at mpe.mpg.de>
+  © 2006 Tom Albers <tomalbers at kde.nl>
+  © 2004-2007 Mark Purcell <msp@debian.org>
+
+
+Primary upstream authors are:
+
+  Gilles Caulier <caulier dot gilles at gmail dot com>
+  Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+  Francisco J. Cruz <fj dot cruz at supercable dot es>
+
+for details on authorship see the /usr/share/doc/digikam/AUTHORS.gz file.
+
+
+The software was downloaded from http://sourceforge.net/projects/digikam
+
+Copyright and licenses:
+
+almost all software is GPL (exceptions listed below):
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+  On Debian GNU/Linux systems, the complete text of the GNU General
+  Public License can be found in `/usr/share/common-licenses/GPL'.
+
+
+digikam/release_digikam_docs.rb: GPL V2 only
+
+Non GPL license notices:
+
+  digikam/digikam_export.h:  LGPL
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Library General Public
+     License as published by the Free Software Foundation; either
+     version 2 of the License, or (at your option) any later version.
+ 
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Library General Public License for more details.
+ 
+     You should have received a copy of the GNU Library General Public License
+     along with this library; see the file COPYING.LIB.  If not, write to
+     the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+     MA 02110-1301, USA.
+
+  On Debian GNU/Linux systems, the complete text of the GNU Library General
+  Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+  digikam/libs/themeengine/texture.cpp,texture.h:
+
+    * Permission is hereby granted, free of charge, to any person obtaining a
+    * copy of this software and associated documentation files (the "Software"),
+    * to deal in the Software without restriction, including without limitation
+    * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    * and/or sell copies of the Software, and to permit persons to whom the
+    * Software is furnished to do so, subject to the following conditions:
+    *
+    * The above copyright notice and this permission notice shall be included in
+    * all copies or substantial portions of the Software.
+    *
+    * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+
+
+  digikam/sqlite/
+
+    ** The author disclaims copyright to this source code.  In place of
+    ** a legal notice, here is a blessing:
+    **
+    **    May you do good and not evil.
+    **    May you find forgiveness for yourself and forgive others.
+    **    May you share freely, never taking more than you give.
+
+
+  digikam/utilities/cameragui jinclude.h, jpegint.h, transupp.c,h:
+		
+	Permission is hereby granted to use, copy, modify, and distribute this
+	software (or portions thereof) for any purpose, without fee, subject to these
+	conditions:
+	(1) If any part of the source code for this software is distributed, then this
+	README file must be included, with this copyright and no-warranty notice
+	unaltered; and any additions, deletions, or changes to the original files
+	must be clearly indicated in accompanying documentation.
+	(2) If only executable code is distributed, then the accompanying
+	documentation must state that "this software is based in part on the work of
+	the Independent JPEG Group".
+	(3) Permission for use of this software is granted only if the user accepts
+	full responsibility for any undesirable consequences; the authors accept
+	NO LIABILITY for damages of any kind.
+
+	These conditions apply to any software derived from or based on the IJG code,
+	not just to the unmodified library.  If you use our work, you ought to
+	acknowledge us.
+
+	Permission is NOT granted for the use of any IJG author's name or company name
+	in advertising or publicity relating to this software or products derived from
+	it.  This software may be referred to only as "the Independent JPEG Group's
+	software".
+
+	We specifically permit and encourage the use of this software as the basis of
+	commercial products, provided that all warranty or liability claims are
+	assumed by the product vendor.
+
+
+Copyrights
+
+digikam/
+	© 2002, 2003, 2004 , 2005 by Renchi Raju
+	© 2003-7 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	© 2004 by Ralf Holzer <ralf at well.com>
+	© 2005,2006 by Tom Albers <tomalbers at kde.nl>
+	© 2005 by Leonid Zeitlin <lz at europe.com>
+	© 2005 by Owen Hirst <n8rider at sbcglobal.net>
+	© 2005 Mark Kretschmann <markey@web.de>
+
+	o digikam/digikam_export.h
+            © 2005 Laurent Montel <montel@kde.org>
+	o from kfiletip source copies (kdebase, konqueror)
+	    © 1998, 1999 Torben Weis <weis@kde.org>
+	    © 2000, 2001, 2002 David Faure <david@mandrakesoft.com>
+	o Concept copied from kdelibs/kio/kio/netaccess.h/cpp
+	    © 1997 Torben Weis (weis@kde.org)
+	    © 1998 Matthias Ettrich (ettrich@kde.org)
+	    © 1999 David Faure (faure@kde.org)
+
+imageplugins/
+	© 2004-2005 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	© 2004-2005 by Renchi Raju
+
+kioslave/
+	© 2003, 2004 by Renchi Raju
+
+libs/
+        © 2004-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	© 2004 by Renchi Raju
+
+	o Some code parts are inspired from gimp 2.0
+            © 1995 Spencer Kimball and Peter Mattis
+
+        o Texture.cc for Fluxbox Window Manager
+            © 2002-2003 Henrik Kinnunen (fluxbox<at>users.sourceforge.net)
+    
+        o from Image.cc for Blackbox - an X11 Window manager
+            © 1997 - 2000 Brad Hughes (bhughes@tcac.net)
+
+	o from  filters/imagefilters.cpp
+	    * Copyright (C) 2004-2005 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	    * Normalize an Equalize algorithms fixed and adapted to work with Raw
+	    * data image (ARGB).
+	    *
+	    * Original Equalise and StretchContrast Algorithms copyright 2002
+	    * by Daniel M. Duley <mosfet@kde.org> from KImageEffect API.
+	    *
+	    * Original Normalize Image algorithm copyrighted 1997 by
+	    * Adam D. Moss <adam@foxbox.org> from Gimp 2.0 implementation.
+	    *
+	    * Original Gaussian Blur algorithm copyrighted 2005 by
+	    * Pieter Z. Voloshyn <pieter_voloshyn at ame.com.br>.
+	    *
+            * Original channel mixer algorithm copyrighted 2002 by
+            * Martin Guldahl <mguldahl at xmission dot com> from Gimp 2.2
+            *
+            * Original sharpening filter from from gimp 2.2
+	    * copyright 1997-1998 Michael Sweet (mike@easysw.com)
+	    *
+	    * Original HSL algorithm from from gimp 2.2
+	    * Copyrigt (C) 1995 Spencer Kimball and Peter Mattis
+
+libs/dialogs/deletedialog.cpp:
+	© 2004 by Michael Pyne <michael.pyne@kdemail.net>
+
+libs/dcraw
+	© 2005,2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	© 2006-2007 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+	© 1997-2006 by Dave Coffin, <dcoffin@cybercom.net>
+
+libs/dimg/
+	© 2006,2007 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+	© 2000-2002  convergence integrated media GmbH <curanz@convergence.de>
+	© 2005 by Renchi Raju
+	© 2005,2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+
+
+libs/dimg/filters/icctransform.cpp:
+	 © 2005-2006 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	 © 2005-2006 by F.J. Cruz
+libs/dimg/loaders/iccjpeg.c: © 1998-2004 Marti Maria
+
+libs/jpegutils:
+	© 1991-1998, Thomas G. Lane.  <tgl@netcom.com>
+
+libs/lprof/cmshull.cpp:/* © 1998-2001 Marti Maria <marti@littlecms.com> */
+libs/lprof/cmshull.cpp:/* This code is © 1998 by Joseph O'Rourke.  It may be freely  */
+libs/threadimageio/loadingcache.cpp: © 2005 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+libs/whitebalance/blackbody.h: © 2004-2005 by Pawel T. Jochym
+
+
+libs/widgets
+	© 1996-2000 the kicker authors.
+	© 2005 Mark Kretschmann <markey@web.de>
+	© 2005-2006 by Joern Ahrens
+	© 2005 by Tom Albers
+	© 1998-2001 Marti Maria
+	© 2006 by Francisco J. Cruz <fj.cruz@supercable.es>
+	© 2006 by Guillaume Laurent <glaurent@telegraph-road.org>
+
+showfoto
+	© 2004-2005 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	© 2004-2005 by Renchi Raju	
+
+sqlite/
+	The author disclaims copyright.
+
+utilities/
+	© 2003, 2004, 2005 by Renchi Raju
+	© 2003-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
+	© 2005-2007 by Gilles Caulier
+	© 2005-2007 by F.J. Cruz <caulier dot gilles at gmail dot com>
+	© 2003 Angelo Naselli
+	© 2005 Jörn Ahrens <joern dot ahrens at kdemail dot net>
+	© 2005 by Gilles Caulier <caulier dot gilles at gmail dot com>
+
+	o modified sources from kdirselectdialog
+	   © 2001 Michael Jarrett <michaelj@corel.com>
+	   © 2001 Carsten Pfeiffer <pfeiffer@kde.org>
+
+	o jinclude.h, jpegint.h, transupp.c,h: a copy from libjpeg62 code
+	    © 1991-1994, 1991-1997 Thomas G. Lane.
+
+        o includes code from gimp version 2.0
+	    © 1995-1997 Peter Mattis and Spencer Kimball
+
+	o original printing code from Kuickshow program.
+	    © 2002 Carsten Pfeiffer <pfeiffer at kde.org>
+
+
+Translations: 
+        ?????? ????? <zlatkopopov at fsa-bg.org> (bg)
+        Golam Mortuza Hossain <gmhossain at gmail.com> (bn)
+        Thierry Vignaud <tvignaud at mandriva.com> (br)
+        Josep Ma. Ferrer <txemaq at gmail.com> (ca)
+        Klara Cihlarova <koty at seznam.cz> (cs)
+        Thierry Vignaud <tvignaud at mandrakesoft.com> (cy)
+        Erik Kjær Pedersen <erik at binghamton.edu> (da)
+        Thomas Reitelbach <tr at erdfunkstelle.de> (de)
+        Spiros Georgaras <sngeorgaras at otenet.gr> (el)
+        Malcolm Hunter <malcolm.hunter at gmx.co.uk> (en_GB)
+        Pablo de Vicente <pablo.devicente at gmail.com> (es)
+        Marek Laane <bald at starman.ee> (et)
+        marcos <marcos at euskalgnu.org> (eu)
+        "Last-Translator: Mikael Lammentausta " (fi)
+        Tung Nguyen <ntung at free.fr> (fr)
+        Kevin Patrick Scannell <scannell at SLU.EDU> (ga)
+        Xabi G. Feal <xabigf at gmx.net> (gl)
+        ????? ???????? <elcuco at kde.org> (he)
+        Tamas Szanto <tszanto at mol.hu> (hu)
+        FULL NAME <EMAIL at ADDRESS> (is)
+        Federico Zenith <zenith at chemeng.ntnu.no> (it)
+        Yukiko BANDO <ybando at k6.dion.ne.jp> (ja)
+        Leang Chumsoben <soben at khmeros.info> (km)
+        Donatas Glodenis <dgvirtual at akl.lt> (lt)
+        Bozidar Proevski <bobibobi at freemail.com.mk> (mk)
+        Sharuzzaman Ahmat Raslan <sharuzzaman at myrealbox.com> (ms)
+        Kevin Attard Compagno <kac_comp at webhostmalta.com> (mt)
+        Øyvind A. Holm <sunny at sunbase.org> (nb)
+        Bram Schoenmakers <bramschoenmakers at kde.nl> (nl)
+        Karl Ove Hufthammer <karl at huftis.org> (nn)
+        Amanpreet Singh Brar <aalam at redhat.com> (pa)
+        Robert Gomulka <rgom at o2.pl> (pl)
+        Pedro Morais <morais at kde.org> (pt)
+        Lisiane Sztoltz Teixeira <lisiane at kdemail.net> (pt_BR)
+        Claudiu Costin <claudiuc at kde.org> (ro)
+        Nick Shaforostoff <shafff at ukr.net> (ru)
+        Steve Murphy <murf at e-tools.com> (rw)
+        Gregor Rakar <gregor.rakar at kiss.si> (sl)
+        Chusslove Illich <caslav.ilic at gmx.net> (sr)
+        Chusslove Illich <caslav.ilic at gmx.net> (sr at Latn)
+        Stefan Asserhäll <stefan.asserhall at comhem.se> (sv)
+        Tamil PC <tamilpc at ambalam.com> (ta)
+        ?smail ?im?ek <simsek at kde.org.tr> (tr)
+        Ivan Petrouchtchak <ivanpetrouchtchak at yahoo.com> (uk)
+        Clytie Siddall <clytie at riverland.net.au> (vi)
+        Funda Wang <fundawang at linux.net.cn> (zh_CN)
--- digikam-0.9.4.orig/debian/showfoto.manpage
+++ digikam-0.9.4/debian/showfoto.manpage
@@ -0,0 +1,154 @@
+.\" This file was generated by kdemangen.pl
+.TH SHOWFOTO 1 "Feb 2005" "K Desktop Environment" "digiKam Photo Viewer"
+.SH NAME
+showfoto
+\- digiKam Photo Viewer
+.SH SYNOPSIS
+showfoto [Qt\-options] [KDE\-options] [file(s)] 
+.SH DESCRIPTION
+digiKam Photo Viewer
+.SH OPTIONS
+.SS
+.SS Arguments:
+file(s)                   File(s) to open
+.SS Generic options:
+.TP
+.B  \-\-help  
+Show help about options
+.TP
+.B  \-\-help\-qt  
+Show Qt specific options
+.TP
+.B  \-\-help\-kde  
+Show KDE specific options
+.TP
+.B  \-\-help\-all  
+Show all options
+.TP
+.B  \-\-author  
+Show author information
+.TP
+.B \-v,  \-\-version  
+Show version information
+.TP
+.B  \-\-license  
+Show license information
+.TP
+.B  \-\-  
+End of options
+.SS 
+.SS KDE options:
+.TP
+.B  \-\-caption  <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B  \-\-icon  <icon>
+Use 'icon' as the application icon
+.TP
+.B  \-\-miniicon  <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B  \-\-config  <filename>
+Use alternative configuration file
+.TP
+.B  \-\-dcopserver  <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B  \-\-nocrashhandler  
+Disable crash handler, to get core dumps
+.TP
+.B  \-\-waitforwm  
+Waits for a WM_NET compatible windowmanager
+.TP
+.B  \-\-style  <style>
+sets the application GUI style
+.TP
+.B  \-\-geometry  <geometry>
+sets the client geometry of the main widget
+.SS 
+.SS Qt options:
+.TP
+.B  \-\-display  <displayname>
+Use the X-server display 'displayname'
+.TP
+.B  \-\-session  <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B  \-\-cmap  
+Causes the application to install a private color
+map on an 8-bit display
+.TP
+.B  \-\-ncols  <count>
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification
+.TP
+.B  \-\-nograb  
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B  \-\-dograb  
+running under a debugger can cause an implicit
+-nograb, use -dograb to override
+.TP
+.B  \-\-sync  
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn,  \-\-font  <fontname>
+defines the application font
+.TP
+.B \-\-bg,  \-\-background  <color>
+sets the default background color and an
+application palette (light and dark shades are
+calculated)
+.TP
+.B \-\-fg,  \-\-foreground  <color>
+sets the default foreground color
+.TP
+.B \-\-btn,  \-\-button  <color>
+sets the default button color
+.TP
+.B  \-\-name  <name>
+sets the application name
+.TP
+.B  \-\-title  <title>
+sets the application title (caption)
+.TP
+.B  \-\-visual  TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display
+.TP
+.B  \-\-inputstyle  <inputstyle>
+sets XIM (X Input Method) input style. Possible
+values are onthespot, overthespot, offthespot and
+root
+.TP
+.B  \-\-im  <XIM server>
+set XIM server
+.TP
+.B  \-\-noxim  
+disable XIM
+.TP
+.B  \-\-reverse  
+mirrors the whole layout of widgets
+.SS 
+
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center.  You can also enter the URL
+.BR help:/showfoto/
+directly into konqueror or you can run 
+.BR "`khelpcenter help:/showfoto/'"
+from the command-line. (Note: The handbook is in the package digikam-doc.)
+.br
+.SH AUTHORS
+.nf
+Renchi Raju <renchi at pooh.tam.uiuc.edu>
+.br
+Caulier Gilles <caulier dot gilles at free.fr>
+.br
+Ralf Holzer <kde at ralfhoelzer.com>
+.br
+.br
+This manual page was prepared by Achim Bohnet <ach@mpe.mpg.de> for the Debian
+GNU/Linux  system (but may be used by others).
+
--- digikam-0.9.4.orig/debian/digikam.manpages
+++ digikam-0.9.4/debian/digikam.manpages
@@ -0,0 +1,2 @@
+debian/digikam.manpage
+digikam/utilities/scripts/digitaglinktree.1
--- digikam-0.9.4.orig/debian/README.Debian
+++ digikam-0.9.4/debian/README.Debian
@@ -0,0 +1,146 @@
+Debian kde-extras Team
+----------------------
+
+1. Contacts
+-----------
+
+General help requests
+	<debian-kde@lists.debian.org>	mailing list
+	#debian-kde			on irc
+
+Packaging queries
+	<debian-qt-kde@lists.debian.org>  mailing list
+	#debian-qt-kde			  on irc
+
+Maintainers
+	<pkg-kde-extras@lists.alioth.debian.org>	mailing list
+
+
+2. Subversion repository
+------------------------
+  
+You can browse it only at:
+
+http://svn.debian.org/wsvn/pkg-kde/kde-extras/
+
+To "checkout" the repository use these commands:
+
+	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Authorized SSH keys are controlled at https://alioth.debian.org/account/
+
+The repository layout is:
+
+- packagename/
+    - trunk/
+    - branches/
+    - tags/
+        - 0.7.2-1/
+        - 0.7.2-2/
+        - 0.7.2-2ubuntu1/
+        - 0.7.2-2ubuntu2/
+        - 0.7.2-2ubuntu3/
+        - 0.8.0/
+        ...
+
+If only one version of the package is available at the time, development must 
+be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
+release is made.
+
+When, at some point, the need to have two different versions at the same time 
+arises (for example, if we need a version to be in unstable and a different one
+to be in experimental), experimental development will be made in trunk/ and 
+if a new unstable package needs to be cooked, copying 
+tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
+trick.
+
+3. Using svn-buildpackage
+--------------------------
+
+Packages with an upstream tarball will require you to set the mergeWithUpstream
+property first (from the package root) so that svn-buildpackage will look for
+the .orig.tar.gz in the ../tarballs directory.
+	
+	% svn propset mergeWithUpstream 1 debian
+
+Please note that this only works for packages which have only the debian/
+directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
+dpatch to modify the upstream sources.
+
+After you have finished and committed your Debian patches via
+	
+	% svn commit [PACKAGE]
+
+as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
+your package with the following commands:
+
+	% svn-buildpackage --svn-ignore-new -rfakeroot
+
+Please, don't commit tarballs/ or build-area/ directories to SVN.
+
+4. Tarballs and Build-area directories
+------------------------------------
+
+During pkg development before uploaded to debian the tarballs can be found at:
+
+	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
+
+You need to place those dirs in the parent directory of the one from which you're 
+running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
+in 'pkgname'/ dir, at the same level as trunk/
+
+If you want to compile inside one version in tags/ dir, you'll need to place those
+dirs inside that dir. Of course the easiest and cleanest way of doing it is 
+by making a symlink of those dirs inside tags/ dir.
+
+5. Using svn-inject
+-------------------
+
+To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
+as follows:
+
+        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Type in your alioth password a few hundred times :-) and your package should be
+uploaded to the archive.  Note you will also need to manually copy the
+package.orig.tar.gz to your tarballs directory.  The -o option is important as
+this ensures that we 'Only keep modified files under SVN control'
+
+6. Versioning
+-------------
+
+As the autobuilder and fellow developers will need to differentiate between
+versions that are uploaded into debian already and those which will be at a
+later point, do use the UNRELEASED distribution until the time you actually do
+upload to incoming. Whoever is not a DD himself should let the sponsor do that
+final step if that sponsor has SVN commit rights to the kde-extras archive.
+
+The autobuilder packs can be found at http://kde-extras.buildserver.net/.
+The logs can be found at http://status.buildserver.net/.
+
+As the archive runs britney, it may well be that a built and installed package
+is not appearing to the archive until its reverse depends are (re)built too. In
+case of questions, feel free to mail kilian@debian.org.
+
+7. Automatic Backport hooks
+---------------------------
+
+The checkout script for putting together the sources can run a backports hook
+for certain dists (like Debian sarge) which need certain adjustments to the
+source like altered Build-Depends. This hook is a plain shell script (or
+makefile like debian/rules) which needs to be put in the debian/backports
+directory and made executable by means of the svn properties set. The codenames
+for the current dists are: sid, etch, sarge, edgy and dapper. For an example
+see asterisk-addons/trunk/debian/backports/sarge which may be more illustrating
+what to do.
+
+8. Autotools, libtool, am_maintainer, buildprep and configure updates
+---------------------------------------------------------------------
+
+Achim, Please add some text in here to document when it is necessary and
+how we update the build enviroment for a package.
+
+-(snip)-
+
+In case any of the above is unclear to you or seems outdated, please drop us a
+note to the maintainers list.
--- digikam-0.9.4.orig/debian/lintian
+++ digikam-0.9.4/debian/lintian
@@ -0,0 +1,9 @@
+# libdigikam.so is no 'proper' shared library.  It's contents
+# changes as needed. Upstream does not support any use beside
+# for digikam and digikamimageplugins (that are released to-
+# gether when the API changes). Therefore we did not split out a
+# libdigikam and libdigikam-dev pkgs.  For further discussion
+# see bug report #324592
+#
+digikam: non-dev-pkg-with-shlib-symlink 
+digikam: package-name-doesnt-match-sonames
--- digikam-0.9.4.orig/debian/digikam.manpage
+++ digikam-0.9.4/debian/digikam.manpage
@@ -0,0 +1,74 @@
+.TH digikam "1" "Feb 2005" "digikam 0.7.4" "User Commands"
+.SH NAME
+digikam \- digital photo management application for KDE
+.SH SYNOPSIS
+.B digikam
+[\fIQt\-options\fR] [\fIKDE\-options\fR]
+[\fB\-\-detect\-camera\fR]
+.SH DESCRIPTION
+Digikam is an easy to use and powerful digital photo management
+application, which makes importing, organizing and editing
+digital photos a "snap".  An easy to use interface is provided
+to connect to your digital camera, preview the images and download
+and/or delete them.
+.PP
+Digikams buildin image editor makes the common photo correction
+a simple task.  The image editor is extensible via plugins.
+The digikam package contains already many useful image editor plugins.
+.PP
+Digikam can also make use of the KIPI image handling plugins to
+extend it's capabilities even further for photo manipulations,
+im- and export, etc.  The kipi-plugins package contains many
+very useful extentions.
+.PP
+.SS "Options:"
+.TP
+\fB\-\-detect\-camera\fR
+Automatically detect and open picture download dialog. Note:
+autodetection does not work with cameras that claim to be
+USB mass storage devices.
+.TP
+\fB\-\-download\-from  <path>\fR
+Open camera dialog at <path>. Use this with cameras that export
+their pictures as USB mass storage.  KDE automounts the camera
+storage, if the path given as, e.g., \fIsystem:/media/<dir>\fR or \fImedia:/<dir>\fR
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH "SEE ALSO"
+The full documentation for
+.B digikam
+is maintained as a html manual in the package digikam-doc. The command
+.IP
+.B khelpcenter help:/digikam
+.PP
+gives you access to the complete manual.
+.SH AUTHOR
+.B digikam
+was written by Renchi Raju and many others (see
+/usr/share/doc/digikam/AUTHORS for details).
+.PP
+This manual page was prepared by Achim Bohnet <ach@mpe.mpg.de> for the Debian
+GNU/Linux  system (but may be used by others).
--- digikam-0.9.4.orig/debian/control
+++ digikam-0.9.4/debian/control
@@ -0,0 +1,62 @@
+Source: digikam
+Section: graphics
+Priority: optional
+Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Uploaders: Achim Bohnet <ach@mpe.mpg.de>, Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, kdelibs4-dev,
+ libtiff4-dev, libgphoto2-2-dev, libkipi0-dev,
+ libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-dev (>= 0.1.6),
+ libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev (>= 0.16),
+ libkdcraw-dev (>= 0.1.4)
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/?op=log
+Homepage: http://www.digikam.org
+
+Package: digikam
+Architecture: any
+Depends: ${shlibs:Depends}, kdebase-kio-plugins
+Recommends: kipi-plugins, kdeprint, konqueror
+Suggests: digikam-doc
+Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0), libkexiv2-0, libexiv2-0.12
+Replaces: digikamimageplugins
+Description: digital photo management application for KDE
+ An easy to use and powerful digital photo management
+ application, which makes importing, organizing and manipulating
+ digital photos a "snap".  An interface is provided to connect to
+ your digital camera, preview the images and download and/or
+ delete them.
+ .
+ The digiKam built-in image editor makes the common photo correction
+ a simple task. The image editor is extensible via plugins and,
+ the digikamimageplugins project has been merged to digiKam core
+ since release 0.9.2, all useful image editor plugins are available
+ in the base installation.
+ .
+ digiKam can also make use of the KIPI image handling plugins to
+ extend its capabilities even further for photo manipulations,
+ import and export, etc. The kipi-plugins package contains many
+ very useful extentions.
+ .
+ digiKam is based in part on the work of the Independent JPEG Group.
+
+Package: showfoto
+Architecture: any
+Section: graphics
+Depends: ${shlibs:Depends}, digikam (>= 2:0.9.1~rc2)
+Recommends: kipi-plugins, kdeprint, konqueror
+Replaces: digikam (<= 2:0.9.0-1)
+Conflicts: digikam (<= 2:0.9.0-1), digikamimageplugins (<< 2:0.9.0~rc2)
+Description: image viewer/editor for KDE
+ Showphoto is part of the Digikam project.
+ It allows to browse your photo collection and edit them with ease.
+
+Package: digikam-dbg
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, digikam (= ${binary:Version}), showfoto (= ${binary:Version}), kdelibs-dbg
+Priority: extra
+Description: debugging symbols for digikam
+ The debugging symbols associated with digikam and showfoto. They will
+ automatically be used by gdb for debugging digikam-related issues.
--- digikam-0.9.4.orig/debian/NEWS
+++ digikam-0.9.4/debian/NEWS
@@ -0,0 +1,8 @@
+digikam (2:0.9.2~beta1-2) unstable; urgency=low
+ 
+  * Upstream have merged the digikamimageplugins with digikam
+  and all are provided in the one application package, digikam.
+  Don't be concerned that this version of digikam Conflicts:/
+  Replaces: digikamimageplugins
+
+ -- Mark Purcell <msp@debian.org>  Sun, 20 May 2007 08:35:22 +0100
--- digikam-0.9.4.orig/debian/xpm.d/showfoto-16.xpm
+++ digikam-0.9.4/debian/xpm.d/showfoto-16.xpm
@@ -0,0 +1,195 @@
+/* XPM */
+static char *showfoto-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 173 2",
+"   c black",
+".  c #020202",
+"X  c #252525",
+"o  c gray20",
+"O  c #2D3744",
+"+  c #3F4142",
+"@  c gray25",
+"#  c #404246",
+"$  c #44494E",
+"%  c #484848",
+"&  c #4E4E4E",
+"*  c #4F5153",
+"=  c #515151",
+"-  c gray32",
+";  c #535454",
+":  c #565656",
+">  c gray34",
+",  c #585858",
+"<  c gray35",
+"1  c #5A5A5A",
+"2  c #5D6D7F",
+"3  c #626262",
+"4  c #646464",
+"5  c #656565",
+"6  c gray40",
+"7  c #676767",
+"8  c gray42",
+"9  c #6F6F6F",
+"0  c #717171",
+"q  c #737071",
+"w  c #757676",
+"e  c gray48",
+"r  c #7C7C7C",
+"t  c #7E7E7E",
+"y  c #5E7085",
+"u  c #5771A4",
+"i  c #658193",
+"p  c #6E99B9",
+"a  c #5C8CCA",
+"s  c #568BDB",
+"d  c #6D9FEF",
+"f  c #6BACE4",
+"g  c #6FB9FE",
+"h  c #75ACF8",
+"j  c #77BAEF",
+"k  c #75B7F6",
+"l  c #73B7F9",
+"z  c #72B8FE",
+"x  c #72BBFC",
+"c  c #7DB7F5",
+"v  c #77C3FE",
+"b  c #808080",
+"n  c #838383",
+"m  c #868B8E",
+"M  c #878C8F",
+"N  c #8A8A8B",
+"B  c #80909C",
+"V  c #88939A",
+"C  c #8F969F",
+"Z  c #95938F",
+"A  c #929291",
+"S  c #929292",
+"D  c #939196",
+"F  c #939496",
+"G  c gray59",
+"H  c #979797",
+"J  c #989596",
+"K  c #9A9A9A",
+"L  c gray61",
+"P  c #8BA4B2",
+"I  c #9EA8B3",
+"U  c gray63",
+"Y  c #A1A2A2",
+"T  c gray64",
+"R  c #A4A4A4",
+"E  c #A5A5A5",
+"W  c gray65",
+"Q  c #A7A7A7",
+"!  c #A4A6A8",
+"~  c #A9A9A9",
+"^  c #A8A9AA",
+"/  c gray68",
+"(  c #AFAFAF",
+")  c gray69",
+"_  c #B2B2B2",
+"`  c #B6B6B6",
+"'  c #B6B6B7",
+"]  c #B7B7B7",
+"[  c #B5B7B9",
+"{  c gray72",
+"}  c gray73",
+"|  c #BBBBBB",
+" . c #BEBCBB",
+".. c gray74",
+"X. c gray",
+"o. c #8DBDF2",
+"O. c #A4BEE5",
+"+. c #86C3FC",
+"@. c #89CDFC",
+"#. c #92C2F3",
+"$. c #ADCCEF",
+"%. c #A4CCF4",
+"&. c #A3CFFA",
+"*. c #A9CDF3",
+"=. c #BED0E5",
+"-. c #BCD7E4",
+";. c #B0D2F4",
+":. c #C0C0C0",
+">. c #C0C1C1",
+",. c #C1C1C1",
+"<. c gray76",
+"1. c #C3C3C3",
+"2. c gray77",
+"3. c #C6C6C6",
+"4. c gray78",
+"5. c #C8C8C8",
+"6. c gray79",
+"7. c #CACACA",
+"8. c #CBCBCB",
+"9. c #C9CCCE",
+"0. c #CBCDCE",
+"q. c gray80",
+"w. c #CDCDCD",
+"e. c #CECECE",
+"r. c gray81",
+"t. c #D2D2D2",
+"y. c LightGray",
+"u. c gray83",
+"i. c #D5D5D5",
+"p. c #D7D7D7",
+"a. c #D7D9DC",
+"s. c #D6DADE",
+"d. c #D8D8D8",
+"f. c gray85",
+"g. c gainsboro",
+"h. c #DDDEDF",
+"j. c #DFDFDF",
+"k. c #C3DAF4",
+"l. c #C7E5F7",
+"z. c #CDE0F3",
+"x. c #DCE3E8",
+"c. c #DCE4EE",
+"v. c #D8E5F4",
+"b. c #DCE7F1",
+"n. c #DBE9F6",
+"m. c gray88",
+"M. c #E2E2E2",
+"N. c #E4E4E4",
+"B. c #E4E5E5",
+"V. c gray90",
+"C. c #E5E6E7",
+"Z. c #E6E6E6",
+"A. c #E2E6EB",
+"S. c #E7E7E8",
+"D. c #E9E9E9",
+"F. c gray92",
+"G. c #EAECEE",
+"H. c #EBEDEE",
+"J. c #EBEEEF",
+"K. c #ECECEC",
+"L. c gray93",
+"P. c #EEEFEF",
+"I. c #E1E9F2",
+"U. c #E3EAF2",
+"Y. c #E5EEF6",
+"T. c #E9EDF1",
+"R. c #EDF0F3",
+"E. c #EFF0F0",
+"W. c #EEF1F3",
+"Q. c #ECF1F6",
+"!. c #EDF1F6",
+"~. c #F2F3F5",
+"^. c None",
+/* pixels */
+"^.^.D.D.H.M.q.^.^.^.^.^.^.^.^.^.",
+"^.^.D.~.W.W.T.H.H.V.r.^.^.^.^.^.",
+"^.:.C.n.%.;.z.Y.W.W.H.V.K.P.V.d.",
+"^.i.H.l.@.v x k #.*.k.v.U.T.H.h.",
+"^.j.H.-.P V M B p f l c o.$.U.p.",
+"^.j.h.D J ` U ~ N i k x x +.b.4.",
+"~ d.X.q ` { X./ t + u d h &.x.' ",
+"X.r.Z & { e _ e 7 X O a s O.a.~ ",
+"L | S 8 r.q.t.7./ > * I =.c.8.0 ",
+"` 3.:.{ p.V.V.V.M.q.N $ y A.[ o ",
+"0.( :.i.d.q.:.` X.X.7 + y s.W ^.",
+"[ W { { X.W 9 > 8 R ~ U C 0.K ^.",
+"W _ 7.7.3.t 7 9 % G 7.3.~ :.b ^.",
+"F [ i.p.t.K : : < W d.i.U K @ ^.",
+"w Q :.3.:._ n 8 t _ :.:.S - ^.^.",
+"; 3 3 7 7 7 < - < 3 7 7 - ^.^.^."
+};
--- digikam-0.9.4.orig/debian/xpm.d/digikam-16.xpm
+++ digikam-0.9.4/debian/xpm.d/digikam-16.xpm
@@ -0,0 +1,156 @@
+/* XPM */
+static char *digikam-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 134 2",
+"   c black",
+".  c gray1",
+"X  c #090909",
+"o  c #151515",
+"O  c #161616",
+"+  c gray9",
+"@  c #191919",
+"#  c gray10",
+"$  c gray11",
+"%  c #202020",
+"&  c gray13",
+"*  c #252525",
+"=  c #282828",
+"-  c gray16",
+";  c gray17",
+":  c #2C2C2C",
+">  c gray18",
+",  c #2F2F2F",
+"<  c #313131",
+"1  c #343434",
+"2  c #353535",
+"3  c gray25",
+"4  c #414141",
+"5  c gray26",
+"6  c #444444",
+"7  c gray27",
+"8  c gray28",
+"9  c gray29",
+"0  c gray31",
+"q  c gray33",
+"w  c gray34",
+"e  c gray35",
+"r  c gray36",
+"t  c gray37",
+"y  c #646464",
+"u  c #656565",
+"i  c #686868",
+"p  c DimGray",
+"a  c #6A6A6A",
+"s  c gray42",
+"d  c #6C6C6C",
+"f  c #6F6F6F",
+"g  c #717171",
+"h  c #727272",
+"j  c gray45",
+"k  c gray46",
+"l  c #767676",
+"z  c #777777",
+"x  c gray47",
+"c  c #7B7B7B",
+"v  c gray49",
+"b  c #7E7E7E",
+"n  c gray50",
+"m  c #808080",
+"M  c gray51",
+"N  c #838383",
+"B  c gray53",
+"V  c #898989",
+"C  c gray54",
+"Z  c #8B8B8B",
+"A  c gray56",
+"S  c gray57",
+"D  c #939393",
+"F  c #979797",
+"G  c #989898",
+"H  c #9B9B9B",
+"J  c gray61",
+"K  c gray62",
+"L  c #A0A0A0",
+"P  c gray63",
+"I  c #A2A2A2",
+"U  c #A4A4A4",
+"Y  c #A5A5A5",
+"T  c gray65",
+"R  c #A7A7A7",
+"E  c gray66",
+"W  c #A9A9A9",
+"Q  c #AAAAAA",
+"!  c gray67",
+"~  c #ACACAC",
+"^  c gray68",
+"/  c #AEAEAE",
+"(  c #AFAFAF",
+")  c gray69",
+"_  c #B2B2B2",
+"`  c #B4B4B4",
+"'  c #B6B6B6",
+"]  c #B7B7B7",
+"[  c gray72",
+"{  c #B9B9B9",
+"}  c #BBBBBB",
+"|  c gray",
+" . c gray75",
+".. c #C3C3C0",
+"X. c #C3C3C3",
+"o. c gray77",
+"O. c #C5C5C5",
+"+. c #C6C6C6",
+"@. c gray78",
+"#. c #C8C8C8",
+"$. c gray79",
+"%. c #CBCBCB",
+"&. c gray80",
+"*. c #CDCDCD",
+"=. c #CECECE",
+"-. c gray81",
+";. c gray82",
+":. c #D2D2D2",
+">. c LightGray",
+",. c gray83",
+"<. c #D5D5D5",
+"1. c gray84",
+"2. c #D8D8D8",
+"3. c gray85",
+"4. c #DADADA",
+"5. c gray86",
+"6. c gainsboro",
+"7. c #DDDDDD",
+"8. c gray87",
+"9. c #DFDFDF",
+"0. c gray88",
+"q. c #E2E2E2",
+"w. c #E4E4E4",
+"e. c #EAEAEA",
+"r. c #ECECEC",
+"t. c gray94",
+"y. c #F3F3F3",
+"u. c #F4F4F4",
+"i. c gray96",
+"p. c #F6F6F6",
+"a. c #F9F9F9",
+"s. c #FBFBFB",
+"d. c gray100",
+"f. c None",
+/* pixels */
+"f.f.f.f.n w s g u 4 t f.f.f.f.f.",
+"f.f.f.~ I @...@.} ] i < f.f.f.f.",
+"f.f.,.| ] ,.w.N ,./ C 3 - f.f.f.",
+"f.@.4.~ @.@.} %.R n f 4 O f.f.f.",
+"f.0.%.z 0.e C ,.0 s x @ X @ f.f.",
+"f.0.~ 8 e.e.7.,.,.} n     O f.f.",
+"z @.Q N } :.:...:.:.S g x _ ~ s ",
+"M a.~ K ] 7.p.p.p.p.y.y.d.K 8 O ",
+"n :.c y.} @.-.,.,.%.%.%.K 1 8 @ ",
+"z Q Q Q R ` G 6 , u ~ R K C G 0 ",
+"n Q I Q I -.= % 2 $ f Q ~ ~ _ x ",
+"S 2.4.4.5.` % q I x t ..8.7.7.~ ",
+"C @.@.@.@.@.9 8 B ~ M I } ] ] Z ",
+"n 7.8.8.8.5.~ M j S B 4.0.8.7.z ",
+"z K K U K U K A N Z H U R I I s ",
+"2 , , , , , < : : : , - : : * . "
+};
--- digikam-0.9.4.orig/debian/xpm.d/digikam.xpm
+++ digikam-0.9.4/debian/xpm.d/digikam.xpm
@@ -0,0 +1,257 @@
+/* XPM */
+static char *digikam[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 219 2",
+"   c black",
+".  c #020202",
+"X  c gray1",
+"o  c gray2",
+"O  c #070707",
+"+  c gray3",
+"@  c #090909",
+"#  c gray4",
+"$  c #0B0B0B",
+"%  c gray6",
+"&  c #101010",
+"*  c gray7",
+"=  c #131313",
+"-  c gray8",
+";  c #151515",
+":  c #161616",
+">  c gray9",
+",  c #181818",
+"<  c gray10",
+"1  c #1B1B1B",
+"2  c gray11",
+"3  c #1E1E1E",
+"4  c gray12",
+"5  c #202020",
+"6  c gray13",
+"7  c #222222",
+"8  c gray14",
+"9  c #252525",
+"0  c gray15",
+"q  c #282828",
+"w  c #2A2A2A",
+"e  c gray17",
+"r  c #2C2C2C",
+"t  c #2D2D2D",
+"y  c gray18",
+"u  c #2F2F2F",
+"i  c gray19",
+"p  c #323232",
+"a  c #343434",
+"s  c #353535",
+"d  c gray21",
+"f  c #373737",
+"g  c gray22",
+"h  c #3A3A3A",
+"j  c gray23",
+"k  c #3C3C3C",
+"l  c gray24",
+"z  c #3F3F3F",
+"x  c #414141",
+"c  c #434343",
+"v  c #444444",
+"b  c gray27",
+"n  c #464646",
+"m  c #484848",
+"M  c #494949",
+"N  c gray29",
+"B  c #4B4B4B",
+"V  c #4C4C4C",
+"C  c gray30",
+"Z  c gray31",
+"A  c #505050",
+"S  c #515151",
+"D  c gray32",
+"F  c #535353",
+"G  c gray33",
+"H  c #555555",
+"J  c #565656",
+"K  c gray34",
+"L  c #585858",
+"P  c gray35",
+"I  c #5A5A5A",
+"U  c gray36",
+"Y  c #5D5D5D",
+"T  c gray37",
+"R  c #5F5F5F",
+"E  c #606060",
+"W  c gray38",
+"Q  c gray39",
+"!  c #656565",
+"~  c gray40",
+"^  c #676767",
+"/  c DimGray",
+"(  c #6A6A6A",
+")  c gray42",
+"_  c #6D6D6D",
+"`  c gray43",
+"'  c #6F6F6F",
+"]  c gray44",
+"[  c #727272",
+"{  c gray45",
+"}  c #747474",
+"|  c gray46",
+" . c #767676",
+".. c #777777",
+"X. c gray47",
+"o. c #797979",
+"O. c gray48",
+"+. c #7B7B7B",
+"@. c #7C7C7C",
+"#. c #7E7E7E",
+"$. c #818181",
+"%. c gray51",
+"&. c #838383",
+"*. c #848484",
+"=. c gray52",
+"-. c #868686",
+";. c gray53",
+":. c #888888",
+">. c gray54",
+",. c #8B8B8B",
+"<. c gray55",
+"1. c #8D8D8D",
+"2. c #8E8E8E",
+"3. c gray56",
+"4. c #909090",
+"5. c gray57",
+"6. c #929292",
+"7. c #939393",
+"8. c gray58",
+"9. c #959595",
+"0. c gray59",
+"q. c #979797",
+"w. c #989898",
+"e. c gray60",
+"r. c #9A9A9A",
+"t. c #9B9B9B",
+"y. c gray61",
+"u. c #9D9D9D",
+"i. c gray62",
+"p. c #9F9F9F",
+"a. c #A0A0A0",
+"s. c gray63",
+"d. c #A2A2A2",
+"f. c gray64",
+"g. c #A4A4A4",
+"h. c #A5A5A5",
+"j. c gray65",
+"k. c #A7A7A7",
+"l. c gray66",
+"z. c #A9A9A9",
+"x. c #AAAAAA",
+"c. c gray67",
+"v. c #ACACAC",
+"b. c gray68",
+"n. c #AEAEAE",
+"m. c #AFAFAF",
+"M. c gray69",
+"N. c #B1B1B1",
+"B. c #B2B2B2",
+"V. c gray70",
+"C. c #B4B4B4",
+"Z. c #B7B7B7",
+"A. c gray72",
+"S. c #B9B9B9",
+"D. c gray73",
+"F. c #BBBBBB",
+"G. c #BCBCBC",
+"H. c gray74",
+"J. c gray",
+"K. c gray75",
+"L. c #C0C0C0",
+"P. c #C1C1C1",
+"I. c gray76",
+"U. c #C3C3C3",
+"Y. c gray77",
+"T. c #C5C5C5",
+"R. c #C6C6C6",
+"E. c gray78",
+"W. c #C8C8C8",
+"Q. c gray80",
+"!. c #CDCDCD",
+"~. c #CECECE",
+"^. c gray81",
+"/. c #D0D0D0",
+"(. c gray82",
+"). c #D2D2D2",
+"_. c LightGray",
+"`. c gray83",
+"'. c #D5D5D5",
+"]. c gray84",
+"[. c #D7D7D7",
+"{. c #D8D8D8",
+"}. c gray85",
+"|. c #DADADA",
+" X c gray86",
+".X c gainsboro",
+"XX c #DDDDDD",
+"oX c gray87",
+"OX c #DFDFDF",
+"+X c gray88",
+"@X c #E1E1E1",
+"#X c #E2E2E2",
+"$X c gray89",
+"%X c #E4E4E4",
+"&X c gray90",
+"*X c #E6E6E6",
+"=X c #E7E7E7",
+"-X c gray91",
+";X c #E9E9E9",
+":X c #EAEAEA",
+">X c gray92",
+",X c #ECECEC",
+"<X c gray93",
+"1X c gray94",
+"2X c #F1F1F1",
+"3X c gray95",
+"4X c #F3F3F3",
+"5X c #F4F4F4",
+"6X c gray96",
+"7X c #F6F6F6",
+"8X c #F8F8F8",
+"9X c #F9F9F9",
+"0X c gray98",
+"qX c #FBFBFB",
+"wX c gray99",
+"eX c #FDFDFD",
+"rX c #FEFEFE",
+"tX c gray100",
+"yX c None",
+/* pixels */
+"yXyXyXyXyXyXyXyXyXyX*.T n z j f j M W yXyXyXyXyXyXyXyXyXyXyXyXyX",
+"yXyXyXyXyXyXyXyX*.G x W &.g.T.V.2.( V f V yXyXyXyXyXyXyXyXyXyXyX",
+"yXyXyXyXyXyXyX*.V ( I.T.T.W.W.W.W.T.T.2.z j yXyXyXyXyXyXyXyXyXyX",
+"yXyXyXyXyXyX6.W k.v.V.d.6.k.v.v.k.&.6.k.k.M f V yXyXyXyXyXyXyXyX",
+"yXyXyXyXyXd...e.0.e.D.@X,X6.#.*.#.:XT.[ 2.2.y p yXyXyXyXyXyXyXyX",
+"yXyXyXyXv.e.0.6.#.T.tXtXtXtXe.G tXtXtX}.~ [ ( 4 y yXyXyXyXyXyXyX",
+"yXyXyXyXv.>.6.' e.7XtX:X@XtXtXd.tX,XG.tXX.G G 5 0 yXyXyXyXyXyXyX",
+"yXyXyXD.v.&...V W.tXv.4 1 >.tXk._.4 # I V.j z 0 O 0 yXyXyXyXyXyX",
+"yXyXv.I.d...A e oXtXG I 0.j tXg.( X...4 :Xe 4 1   1 > yXyXyXyXyX",
+"yXyXD.T.6.T p 5 ,XtX[     A tXg.u.    f tXe O     O 4 yXyXyXyXyX",
+"yXyXT.G.*.V > 0 7XtX1X~ T @XtXk.tX..V I.tXp         4 yXyXyXyXyX",
+"yXyXW.v...z O # :XtXtXtXtXtXtXg.tXtXtXtXtX0         >   yXyXyXyX",
+"> A 6.&.T j 1 1 g.I.I.I.I.I.I.>.I.I.T.T.D.5 > = = = f /.T.v.yXyX",
+"j g.:X:X:X:X:X:X:X:X:X*X:X*X*X*X*X*X*X*X*X*X*X*X*X1X}.d...( W yX",
+"' v.tXtXW.v.v.V.D.G.:XtXtXtXtXtX7XtXtXtXtX7XtXtXtX/.0.~ f # y   ",
+"0.k.7X7X*.I.g.}.1XT./.7X1X7X1X7X7X7X7X1X7X7X1X1X@X>.I e     5   ",
+"u.d.*X*Xe.:X7XtX7X@XoX@X*X@X@X@X@X@X@X@XoX@X@X@XV.V 4     5 1   ",
+"u.0././.v.T.:X*X:XtX@X!.!._.@X*X@X@X_.!.!.!.W.!.v.y O y n X.x   ",
+"e.2.G.G.G.G.G.G.G.G.G.G.oX:X*.V n G &._.G.D.D.D.V.*.' *.2.e.T   ",
+"e.&.v.v.k.k.k.k.k.k.g.oX@Xf 4 = % # > G d.k.g.g.k.k.u.u.g.k.[   ",
+"e.>.V.v.V.v.V.V.V.V.!.@Xj > 4 y f y 1   ~ e.V.V.V.V.V.V.V.V.&.  ",
+"e.e.d.u.d.u.e.e.e.e._.D.0 5 n g.>.T M 1 O 0.d.k.g.k.k.v.v.v.g.O ",
+"e.V.7X7X7X7X7X7X7X7X:X~ > e G v.g.*...z   2.V.1X1X1X1X1X1X1XI.O ",
+"e.G.}.}.}.}.}.}.}.oX@X2.0 p A ..0.d.e.T   d.6.oXoXoX}.oXoX}./.O ",
+"0.W.1X1X1X1X1X7X7X1X:XG.M 5 x ~ >.g.V.  M 0.D.7X7X7X7X7X7X7XoX  ",
+"0.d.}._._.}._._._._.}.T.2.n 4 j G (   j v.G g._._./._._._._.g.O ",
+"0.e._._.}._.}.}.}.}.}.T.k.u...~ I ' 2.k.M 2.I.}.}.}.}.}.}.}.e.O ",
+"0.u.@XoXoXoXoX@XoX@XoXoXI.2.>.2.0.[ G W 6.g.@X@X@X@XoX@X@XoXu.O ",
+"0.e.}.}.}.}.}.}.}.}.}.oX}./.g.#.' X.2.2.k._.}.}.}.}._.}.}.}.0.O ",
+"0.#.*.>.*.>.*.>.>.>.>.*.>.*.>.>.&.&.*.*.>.>.2.>.>.>.2.2.>.>...= ",
+"x G G A G A A G A G A A A A G A A A A A A A A A A A A A V n 1   ",
+"                                                                "
+};
--- digikam-0.9.4.orig/debian/xpm.d/showfoto.xpm
+++ digikam-0.9.4/debian/xpm.d/showfoto.xpm
@@ -0,0 +1,199 @@
+/* XPM */
+static char *showfoto[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 161 2",
+"   c #000000",
+".  c #0B0B0B",
+"X  c #131313",
+"o  c #15191D",
+"O  c #1A1A1A",
+"+  c #1F262E",
+"@  c #232323",
+"#  c #2D2D2D",
+"$  c #323232",
+"%  c #353739",
+"&  c #3C3C3C",
+"*  c #343351",
+"=  c #434343",
+"-  c #4A4A4A",
+";  c #4A4D53",
+":  c #555555",
+">  c #5B5B5B",
+",  c #515962",
+"<  c #626262",
+"1  c #616669",
+"2  c #6C6C6C",
+"3  c #717171",
+"4  c #777778",
+"5  c #72787B",
+"6  c #7A7A7A",
+"7  c #3774C6",
+"8  c #4C6D91",
+"9  c #4B6E9C",
+"0  c #5A7C98",
+"q  c #4975AA",
+"w  c #6A7A80",
+"e  c #727C81",
+"r  c #7B7ADB",
+"t  c #5F89B7",
+"y  c #6B8089",
+"u  c #77818D",
+"i  c #708B99",
+"p  c #7D8E95",
+"a  c #7692B2",
+"s  c #71A3BE",
+"d  c #7CA0B0",
+"f  c #4283D5",
+"g  c #4F82D6",
+"h  c #568FD7",
+"j  c #4D92E5",
+"k  c #579DEC",
+"l  c #5CA2EF",
+"z  c #5AA4F6",
+"x  c #5CA6F9",
+"c  c #5FABFC",
+"v  c #648DC9",
+"b  c #638DE0",
+"n  c #6B98ED",
+"m  c #7C9FE4",
+"M  c #749DF2",
+"N  c #7C9AF9",
+"B  c #7FB8D2",
+"V  c #66A0E2",
+"C  c #67A3EA",
+"Z  c #68A4EA",
+"A  c #6FA8E7",
+"S  c #6FABEE",
+"D  c #62A9F5",
+"F  c #62ADFB",
+"G  c #69AFF7",
+"H  c #6CAFFA",
+"J  c #65B2FE",
+"K  c #68B5FF",
+"L  c #6DBBFF",
+"P  c #76A9E4",
+"I  c #76AEFF",
+"U  c #7CA9FF",
+"Y  c #7EB1EA",
+"T  c #78BFE6",
+"R  c #75B1F2",
+"E  c #71B4FF",
+"W  c #72BBFE",
+"Q  c #79BCFF",
+"!  c #73C3FF",
+"~  c #77C8FF",
+"^  c #7BCBFE",
+"/  c #838384",
+"(  c #85898C",
+")  c #8C8C8C",
+"_  c #858D95",
+"`  c #838D9B",
+"'  c #8E9091",
+"]  c #939393",
+"[  c #949698",
+"{  c #9A9A9A",
+"}  c #8EADBB",
+"|  c #A3A3A4",
+" . c #A4A6A8",
+".. c #ACACAC",
+"X. c #ADAFB1",
+"o. c #B2B2B2",
+"O. c #BBBBBB",
+"+. c #8795FE",
+"@. c #8DA5CF",
+"#. c #91B2DE",
+"$. c #82ABFE",
+"%. c #8CAEFF",
+"&. c #85B7EE",
+"*. c #84BCFF",
+"=. c #8ABDF7",
+"-. c #91B7E3",
+";. c #9DBFE6",
+":. c #9BBFE8",
+">. c #9ABDFD",
+",. c #B7BEC6",
+"<. c #86C6FF",
+"1. c #81D2FF",
+"2. c #89D5FE",
+"3. c #98C3F3",
+"4. c #9ACAFF",
+"5. c #94DBFD",
+"6. c #9DDFFF",
+"7. c #AFC1C7",
+"8. c #AACEDE",
+"9. c #A2C4EA",
+"0. c #ADC8E7",
+"q. c #A3CDFC",
+"w. c #A9D3EE",
+"e. c #A2D6F1",
+"r. c #A7D1FF",
+"t. c #A9DDF5",
+"y. c #B2CEED",
+"u. c #B8CDE5",
+"i. c #BACFEA",
+"p. c #BCD4EE",
+"a. c #B2D6FF",
+"s. c #B8D4F4",
+"d. c #B8DBFE",
+"f. c #A4E2FF",
+"g. c #B5E2FF",
+"h. c #C3C3C3",
+"j. c #CBCBCB",
+"k. c #D4D4D4",
+"l. c #DBDBDB",
+"z. c #C2D4E9",
+"x. c #C6DAEB",
+"c. c #CFDCED",
+"v. c #C5DAF1",
+"b. c #CBE4FD",
+"n. c #DBE2EC",
+"m. c #DBE9EF",
+"M. c #D6E2F1",
+"N. c #D0E3F9",
+"B. c #DAE4F4",
+"V. c #DDEEFF",
+"C. c #E3E3E3",
+"Z. c #EBEBEB",
+"A. c #E3EBF3",
+"S. c #EBEDF1",
+"D. c #ECF0F5",
+"F. c #EBF3FC",
+"G. c #F2F2F2",
+"H. c #F3F7FB",
+"J. c #F5F8FB",
+"K. c #FBFBFB",
+"L. c None",
+/* pixels */
+"L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.L.h./ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.: Z.G.S.Z.C.l.j.{ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.O.J.K.K.K.J.G.S.C.j.{ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.L.k.K.S.9.p.B.D.K.K.K.G.Z.Z.C.C.j. .L.L.L.L.L.L.L.L.L.L.",
+"L.L.L.L.o.C.K.x.G G R &.9.i.G.K.K.K.K.G.Z.Z.k...  L.L.L.L.L.L.L.",
+"L.L.L.L.j.Z.K.w.~ W L K K F l A 9.y.M.S.K.K.K.J.Z.Z.C.C.k.O.L.L.",
+"L.L.L.L.l.G.F.e.2.2.~ ~ L L G G c D S Y 9.u.S.J.K.K.K.G.G.Z.k.o.",
+"L.L.L.L.l.G.A.t.f.f.6.2.1.^ ^ ! ! L K J c x k V -.y.c.A.G.K.C.] ",
+"L.L.L.L.C.J.m.8.} p 6 5 e i s ~ ~ ~ ! W K K J c z l C P A.J.k.< ",
+"L.L.L.L.C.K.7.w u {  ...| { / e B 2.1.1.^ ~ W W K K J J J.J...  ",
+"L.L.L.) Z.O.4 ) { | { ' ' [ ] / 1 d 5.5.2.^ H E ~ W L <.J.G.6   ",
+"L.L.L.o.l./ 6 ) j.C.k./ ] k.j.4 < ; @.>.%.$.$.U I Q ^ d.G.C.    ",
+"L.L./ O.| 4 > O.Z.k.C.k.j.k.h.| = $ * r +.N n M $.$.*.b.G.j.  L.",
+"L.L...O.) : : C.o.2 3 l.o./ & { $ @ X 0 W D j f g b m M.Z.o.  L.",
+"L.L.O...6 $ > Z./ # = j.| = X ) &     % v.d.=.Z f 7 v A.C.{ L.L.",
+"{ ..O.| < O < G.j.2 | C.h./ 2 j.=     X ,.F.H.F.N.y.i.G.k.6 L.L.",
+") 6 o.] > O > C.G.C.Z.l.j.Z.Z.l.= . . o _ p.b.V.F.F.F.Z.h.< L.L.",
+"{ ] o.O...] ..k.k.k.k.k.j.l.k.j.| ] ] ) ' u a 3.r.a.D.S.| . L.L.",
+"o.o.C.Z.O.O.j.j.l.G.G.Z.G.G.G.G.Z.Z.C.{ : + + t *.4.G.Z.4   L.L.",
+"h...l.k...k.Z.l.l.l.C.l.l.l.C.l.l.l...: X   o 8 H q.Z.k.X   L.L.",
+"O.{ h.h.h.C.Z.Z.k.j.k.k.k.j.j.h.h.h.) # O $ > q Z s.Z.h.  L.L.L.",
+"..] ....o.o.O.o.o.j.j./ > > / ......| / 6 ) ( 9 h z.C. .  L.L.L.",
+" .] o.o.o.o.o.o.h.h.> & & # @ : | ..o.....o.| ` #.n.l.{   L.L.L.",
+"{ { h.j.j.j.h.j.l./ # 3 ] 2 & X 4 O.h.j.h.j.o.{ Z.Z.j./ L.L.L.L.",
+"{ { j.j.j.j.j.k.l.3 $ 2 ] ] > O < o.j.j.j.j.O.] C.C.h.1 L.L.L.L.",
+"' | k.k.k.l.k.k.k.) $ - 3 / - # 2 o.k.k.k.k.h.< { o.{ # L.L.L.L.",
+") { j.k.k.k.k.k.k...2 # # # $ < 3 O.k.l.k.l.h.< . - >   L.L.L.L.",
+"6 { k.l.C.l.l.l.l.j.| / 2 2 3 2 | k.l.k.l.l.h.< L.L.L.L.L.L.L.L.",
+"> ] j.k.k.k.k.k.k.j.O.{ 6 4 6 ] h.k.k.k.k.j.O.> L.L.L.L.L.L.L.L.",
+"  2 3 3 3 2 2 3 3 3 3 2 3 2 2 3 3 2 3 3 3 3 < $ L.L.L.L.L.L.L.L.",
+"L.# @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ O . L.L.L.L.L.L.L.L."
+};
--- digikam-0.9.4.orig/debian/digikam.install
+++ digikam-0.9.4/debian/digikam.install
@@ -0,0 +1,10 @@
+usr/bin/digi*
+usr/include/kde
+usr/lib
+usr/share/apps/digikam
+usr/share/apps/konqueror/servicemenus/digikam*.desktop
+usr/share/applications/kde/digikam.desktop
+usr/share/icons/hicolor/*/apps/digikam.png
+usr/share/locale
+usr/share/servicetypes/digikamimageplugin.desktop
+usr/share/services
--- digikam-0.9.4.orig/debian/digikam.menu
+++ digikam-0.9.4/debian/digikam.menu
@@ -0,0 +1,7 @@
+?package(digikam):\
+	needs="X11"\
+	section="Applications/Viewers"\
+	title="digikam"\
+	icon32x32="/usr/share/pixmaps/digikam.xpm"\
+	icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+	command="/usr/bin/digikam"
--- digikam-0.9.4.orig/debian/showfoto.menu
+++ digikam-0.9.4/debian/showfoto.menu
@@ -0,0 +1,7 @@
+?package(showfoto):\
+	needs="X11"\
+	section="Applications/Viewers"\
+	title="showfoto"\
+	icon32x32="/usr/share/pixmaps/showfoto.xpm"\
+	icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+	command="/usr/bin/showfoto"
--- digikam-0.9.4.orig/debian/changelog
+++ digikam-0.9.4/debian/changelog
@@ -0,0 +1,1108 @@
+digikam (2:0.9.4-1ppa4) hardy; urgency=low
+
+  * New upstream release
+    - digiKam 0.9.4 Release Plan (KDE3) ~ 13 July 08 (Closes: #490144)
+  * DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
+  * Removed all patches as they've been included upstream
+  * Allow sqlite3 >= 3.4.2 as that's what's on hardy
+
+ -- David Fraser <davidf@sjsoft.com>  Mon, 22 Sep 2008 12:41:00 +0200
+
+digikam (2:0.9.3-2ubuntu1) hardy; urgency=low
+
+  [ Achim Bohnet ]
+  * debian/control: remove --enable-debug=full to stop DDebug flood
+    stderr on startup. (Nodebug uses: -DNDEBUG -DNO_DEBUG -O2 -g -Wall -O2
+    Full debug used: -fno-builtin -g3 -fno-inline -g -Wall -O2).
+
+  * digikam.manpage: remove reference to digikamimageplugins. Pkg was merged
+    into digikam package.
+
+ -- Achim Bohnet <allee@kubuntu.org>  Thu, 27 Mar 2008 01:04:51 +0100
+
+digikam (2:0.9.3-2) unstable; urgency=low
+
+  [ Achim Bohnet]
+
+  * Cherry pick fixes from KDEs SVN:
+      40_kdesvn783161_fix_wrong_file-exits_check.diff
+      40_kdesvn786622_honour_scrollbar.diff
+
+  * Remove build-deps:
+    + automake1.9: We take care that no rebuilding is necessary.
+    + libexif-dev: replaced by libexiv2 upstream.
+
+  * Remove Paul Telford <pxt@debian.org> from uploaders.  He's no longer
+    involved in digikam maintenance. Thx for taking care of digikam as
+    well as sponsoring me for a long time.
+
+  * debian/copyright: replace Copyright (C) with ©
+
+  * remove debian/TODO.  Had only outdated or will not happen stuff.
+
+  * Merge my changes from kubuntu:
+
+  * Remove relibtoolization patches:
+      02_autotools_update.diff
+      03_libtool_update.diff
+      04_am_maintainer_mode.diff
+      05_pedantic-errors.diff
+      06_disable_no_undefined.diff
+      98_buildprep.diff
+    let linker flag --as-needed in debian/rules do the job.
+
+  * Add patch to fix FTBFS with new libkdcraw3 pkgs (0.1.4) required by
+    kipi-plugins 0.1.5: 20_fix_ftbfs_with_libkdcraw3.diff .
+    Fixes: https://bugs.kde.org/show_bug.cgi?id=146393
+    Thx to the Mandriva Maintainer Angelo Naselli to point me to the patch.
+    (Closes: #472547 digikam: FTBFS with current libkdcraw)
+
+  * Bump build dependency of libkdcraw to >= 0.1.4 as libkdraw3 patch above
+    requires it.
+
+  * Fix: [Hardy] digikam duplicates downloaded images while overwriting
+    existing ones.  Added: patches/10_lp201053_fix_download_rename_race.diff
+    This is a backport of KDE SVN commit 783150. (Closes LP: #201053).
+    See also http://bugs.kde.org/show_bug.cgi?id=158377 for more information.
+
+  * add missing final newline to showfoto.install.
+
+  * Edited images saved with a new name wheree only read/writabblbe by it's
+    owner.  Now the umask is used. Add patches/30_respect_umask.diff.  Fixes
+    http://bugs.kde.org/show_bug.cgi?id=145252 .
+
+  * Dropped kubuntu change:
+    + build-dep bumps of libkexiv2-dev and libexiv2-dev. They were only
+      needed for a library transition.
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 25 Mar 2008 20:30:38 +0100
+
+digikam (2:0.9.3-1) unstable; urgency=low
+
+  * New upstream release
+
+  * Add myself in Uploaders field
+  * Remove tiffloader patch. Fixed upstream (Closes: #458434)
+  * Bump Standards-Version to 3.7.3
+  * Build with --as-needed
+
+ -- Fathi Boudra <fabo@debian.org>  Fri, 04 Jan 2008 09:26:34 +0100
+
+digikam (2:0.9.3~rc1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Mark Purcell <msp@debian.org>  Mon, 10 Dec 2007 07:28:30 +0000
+
+digikam (2:0.9.3~beta3-1) experimental; urgency=low
+
+  * New upstream release
+
+  * Remove Depends: libgphoto2-2-dev thnks to kdelibs patch from pusling
+     - dependency on dev package (libgphoto2-2-dev) (Closes: #416123)
+  * Working debian/watch from Raphael
+    - debian/watch fails to report upstream&#39;s version (Closes:
+    #449649)
+
+ -- Mark Purcell <msp@debian.org>  Wed, 21 Nov 2007 14:55:09 +0000
+
+digikam (2:0.9.3~beta2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Mark Purcell <msp@debian.org>  Fri, 02 Nov 2007 22:20:39 +0000
+
+digikam (2:0.9.3~beta1-1) experimental; urgency=low
+
+  * New upstream release
+    - "Download all" not always selectable (Closes: #439826)
+
+ -- Mark Purcell <msp@debian.org>  Fri, 12 Oct 2007 19:18:31 +0100
+
+digikam (2:0.9.2-5) unstable; urgency=low
+
+  [ Mark Purcell ]
+  * include debian/sf-get-source.mk
+  * Add tiffloader patch from upstream
+    - digikam and showfoto display tiff files with weird colors on powerpc
+    (Closes: #432503)
+  * cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
+  * Rebuild for libkexiv2 & libdcraw transitions
+  * lintian cleanup menu-item-uses-apps-section
+
+ -- Mark Purcell <msp@debian.org>  Sat, 29 Sep 2007 11:40:59 +0100
+
+digikam (2:0.9.2-4) unstable; urgency=low
+
+  [ Mark Purcell ]
+  * FTBFS: --enable-final seems to much for arm (Closes: #434656)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed, 25 Jul 2007 18:55:49 +0100
+
+digikam (2:0.9.2-3) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * added patches/13_kde_r681776_kubuntu_fix_fr_translation_servicemenus.diff.
+    Fixes encoding of french translation in hotplug service desktop files.
+    Thx to Anthony Mercatante <tonio@ubuntu.com> for the patch. I've merged it
+    upstream.
+  * add patches/14_kde_r681520_bug147347_fix_showfoto_crash_open_twice.diff
+    showfoto crases when an already opened image is opened another time. Fixes
+    KDE bug: 147347
+  * clean up in debian/TODO
+
+  [ Mark Purcell ]
+  * Switch to COMPAT mode 5 (used by cdbs for -dbg packages)
+  * Build digikam-dbg package to provide debugging symbols for both
+    - digikam and showfoto
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 06 Jul 2007 10:14:41 +0100
+
+digikam (2:0.9.2-2) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * add selected fixes from upstream:
+    10_kde_r680586_bug147248_sync_image_info_in_ie.diff
+    11_kde_r680604_bug147147_fix_apply_tags.diff
+    12_kde_r676579_bug120450_fix_crop_tool_helper_lines.diff
+  * debian/rules: cleanup po/*/*.gmo files.  They clutter buildprep diff
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 26 Jun 2007 22:24:32 +0100
+
+digikam (2:0.9.2-1) experimental; urgency=low
+
+  * new upstream release
+     + coordinate lib trans with other apps (so better experimental upload)
+     will move to unstable once dependant libs are available
+
+  [ Tom Albers ]
+  * removed digikamimageplugins recommend from showfoto package
+    (Closes: #427696)
+
+  [ Achim Bohnet ]
+  * bump build depends on libkdcraw >= 0.1.1. with has new ABI version.
+
+  [ Mark Purcell ]
+  * Depreciate Depends: libdcraw-runtime
+  * Minor editing of debian/control debian/NEWS
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon, 18 Jun 2007 10:55:36 +0100
+
+digikam (2:0.9.2~beta3-1) unstable; urgency=low
+
+  * New upstream release
+    - Light Table and Preview Mode can work with full image size instead a
+    reduced one.
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 05 Jun 2007 07:26:53 +0100
+
+digikam (2:0.9.2~beta2-1) unstable; urgency=low
+
+  * New upstream release
+    - 0.9.2~beta1-2 uninstallable on amd64 (Closes: #425381)
+  * Update debian/control & debian/NEWS to advise of the merge of
+  digikam & digikamimageplugins
+  * Depends: libkdcraw-runtime
+    - unable to find kdcraw executable (Closes: #425292)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 29 May 2007 21:33:39 +0100
+
+digikam (2:0.9.2~beta1-2) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * new upstream release:
+    + Closes: #424506: digikam - FTBFS:  error: request for member 'c_str' in
+      '((Exiv2::Error*)e)->Exiv2::Error::what()' ..
+  * debian/control: add new build-dep libkdcraw-dev and libexiv2-dev (>= 0.14).
+    Closes: #424619: digikam_2:0.9.2~beta1-1(hppa/experimental): FTBFS: libkdcraw
+    missing
+
+  [ Mark Purcell ]
+  * Conflicts: libexiv2-0.12 - breaks kipi-plugins
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 17 May 2007 18:10:25 +0100
+
+digikam (2:0.9.2~beta1-1) experimental; urgency=low
+
+  * New Upstream Release
+
+  [ Mark Purcell ]
+  * Patches deleted as encorporated upstream:
+    - debian/patches/10-gcc43-fix.diff
+    - debian/patches/11-add-service-menu-translations.diff
+    - debian/patches/12-kdesvn-r649833-fix-tile-cache.diff
+  * Conflicts:/Replaces: digikamimageplugins - upstream has merged
+  * Ensure kipi-plugins et al are correct versions/ correct libraries
+    - Conflicts: libkexiv2-0 
+    - Build-Depends: libkexiv2-dev (>= 0.1.5)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 11 May 2007 07:00:21 +0100
+
+digikam (2:0.9.1-4) unstable; urgency=low
+
+  [ Mark Purcell ]
+  * Build-Depends: libjasper-dev
+    - Uninstallable on amd64 - libjasper (Closes: #423086)
+  * lintian cleanup: possible-missing-colon-in-closes
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed, 09 May 2007 21:16:17 +0100
+
+digikam (2:0.9.1-3) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * debian/control: Fix XS-Vcs-*.  Packaging moved from branches/experimental
+    to trunk/
+  * add debian/patches/10-gcc43-fix.diff. Fixes: FTBFS with GCC 4.3: missing
+    #includes (Closes: #417682).  Thanks to Martin Michlmayr for the patch.
+  * add debian/patches/11-add-service-menu-translations.diff: fix UTF-8
+    encoding in digikam/utilities/hotplug/digikam-*.desktop.in: Use KDE svn
+    version of the file which contains turkish translation too fix french
+    translation. Thanks to Anthony Mercatante <tonio@ubuntu.com> for the
+    patch.
+  * add debian/patches/12-kdesvn-r649833-fix-tile-cache.diff: Editor tile
+    cache mechanism does not work, making rendering slow. Thanks to
+    Luka Renko <lure@ubuntu.com> for the patch.
+
+  [ Mark Purcell ]
+  * dcraw is embedded in > 0.9
+    - error running dcraw command (Closes: #414861)
+  * Fixed upstream
+    - digikam fails to autostart when gphoto support is needed (Closes:
+    #399197)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 20 Apr 2007 07:05:08 +1000
+
+digikam (2:0.9.1-2) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * Depend on kdebase-kio-plugins.  The pkg contains kio_trash and makes
+   'Move to Trash' working for e.g. Gnome sessions. Fixes report on
+   digikam-user mailing list and closes malone #75435.
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon,  5 Mar 2007 20:40:13 +0000
+
+digikam (2:0.9.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Build-Depends: libjasper-1.701-dev | libjasper-dev, libpng12-dev | libpng-dev
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon,  5 Mar 2007 18:29:28 +0000
+
+digikam (2:0.9.1~rc2-1) experimental; urgency=low
+
+  * new upstream release
+
+  [ Achim Bohnet ]
+   * README.Debian: fix encoding: 8859-1 -> utf8
+   * debian/copyright: Upstream added email to copyright, iso8859-1 -> utf8
+   * debian/control: tighten depends on digikam
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Tue, 20 Feb 2007 21:32:52 +0000
+
+digikam (2:0.9.1~rc1-1) experimental; urgency=low
+
+  * new upstream release
+
+  [ Achim Bohnet ]
+  * debian/watch: fix to match beta and rc releases.
+  * debian/control:
+    + recommend a more recent version of digikamimageplugins than digikam
+      conflicts with.
+    + build-dep on libkexiv2-dev. New requirement with 0.9.1-beta1.
+    + libdigikam0 and libdigikam-dev existed only for a very short period
+      and are not part of any distro release. Remove conflicts and replaces
+      with these pkgs.
+    + Point XS-Vcs-* headers to branches/experimental until 0.9 is moved to sid
+      post etch release.
+    + Bump kipi-plugins conflict to <= 0.1.3~rc0. So libexiv2-0.12 is used
+      for kipi-plugins too.
+  * Merging Kubuntu changes of 1:0.9.0-0ubuntu2: split digikam into digikam
+    and showfoto packages. Thx to Anthony Mercatante <tonio@ubuntu.com>.
+
+  [ Mark Purcell ]
+  * Showfoto also Conflicts: digikam (<= 2:0.9.0-1)
+  * Updated copyright file. New contributors and a new year
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon, 19 Feb 2007 17:58:14 +0100
+
+digikam (2:0.8.2-4) unstable; urgency=medium
+
+  [ Debian KDE Extras Team ]
+  * urgency medium as this fixes some usability issues and
+    is targeted for release with etch
+
+  [ Achim Bohnet ]
+  * Fix path to icons in digikam tips file. (Closes: #407136): digikam: Missing
+    picture on Tip of the day
+  * debian/control:
+    + bump Standards-version to 3.7.2. No changes necessary
+    + add XS-VCS headers
+
+  [ Mark Purcell ]
+  * Ensure service menu (digikam_upload_photos.desktop) is displayed for
+    mounted media only
+    - uploading servicemenu does not work with unmounted media (Closes:
+    #404127)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun,  4 Feb 2007 11:34:05 +0000
+
+digikam (2:0.8.2-3) unstable; urgency=medium
+
+  [ Mark Purcell ]
+  * Backport of 0.8.2 for etch as exiv2 library transition isn't going to happen..
+  * Urgency medium as this fixes RC bug and rdepends on libexiv2
+  as discussed on debian-release (Closes: #401416)
+  * If you don't wish to downgrade, please track digikam-0.9 in experimental
+  at least until after etch is released
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 22 Dec 2006 10:26:13 +1100
+
+digikam (2:0.9.0-1) experimental; urgency=low
+
+  * new upstream release
+
+  [ Achim Bohnet ]
+  * remove patches, now included in upstream tarball:
+    + 10_kdesvn_606804_dcraw-return-code.diff
+    + 11_kdesvn_606805_file-extention-parsing.diff
+    + 12_kde_606923_fix_huge_memory_leak.diff
+  * bump build-dep on exiv2 to >=0.12
+  * debian/control: bump conflict with digikamimageplugins to << 0.9.0~rc2
+    because that build against libexiv2-0.10 not 0.12.
+  * build with enable-final. Upstream tested final for 0.9.0
+  * remove --disable-debug.  It's already the default in cdbs
+  * control:
+    + change XS-X-Vcs-Svn -> XS-Vcs-Svn
+    + add XS-Vcs-Browser header field, pointing to an http:// -browsable URL
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon, 18 Dec 2006 14:40:34 +0100
+
+digikam (1:0.9.0~rc1-1) unstable; urgency=low
+
+  * New upstream release
+
+  [ Achim Bohnet ]
+  * cleanup debian/TODO a bit: imlib2 and libkexif dependencies are
+    already removed.  There's no dcraw dependency anymore too (digikam
+    includes it's own version)
+  * add version build-dep on libexiv2-dev >= 0.9.1. to guide backports
+  * removed patches/va_list.patch. No longer necesssary
+  * removed patches/11_only_-lqt-mt.diff: autoconf 2.60 uses a totally
+    different method to substitute vars.
+  * Pick fixes from svn:
+    + 10_kdesvn_606804_dcraw-return-code.diff : fix file-extention parsing
+      when it's a null string KDEBUG: 137495
+    + 11_kdesvn_606805_file-extention-parsing.diff: dcraw fail to decode a
+       RAW file. KDEBUG: 137495
+    + patches/12_kde_606923_fix_huge_memory_leak.diff: fix huge memory
+      corruption relevant of a wrong deletion of data shared between preview
+      kio-slave and digiKam.  Without this fix, digiKam is unstable
+      with unsupported/broken pictures to show. It can crash everywhere
+      with a non suitable backtrace.
+  * Bump standards-version to 3.7.2. No changes necessary.
+  * control: add XS-X-Vcs-Svn: header field pointing to pkg repository
+    location
+
+  [ Mark Purcell ]
+  * Conflicts: digikamimageplugins (<< 0.9.0~rc1)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 23 Nov 2006 21:17:01 +0000
+
+digikam (1:0.9.0~beta3-3) unstable; urgency=low
+
+  [ Mark Purcell ]
+  * Add debian/patches/va_list.patch
+    - FTBFS (alpha): attempt to use output operater '<<' on va_list
+    (Closes: #396747)
+  * Re-Add Build-Depends: libgphoto2-2-dev
+    - libgphoto2-2-dev needed (Closes: #396249)
+  * Ack fixes from experimental
+    - Digikam doesn't save modified Tiff images (Closes: #375982)
+    - "Toggle Full Screen" should be in the View menu (Closes: #378477)
+    - Crashes on assigning icon to tag (Closes: #393505)
+    - I would like to have AND between tags and not OR. (Closes: #329014)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sat,  4 Nov 2006 10:12:50 +0000
+
+digikam (1:0.9.0~beta3-2) unstable; urgency=low
+
+  * Migrate to unstable
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 29 Oct 2006 12:38:39 +0000
+
+digikam (1:0.9.0~beta3-1) experimental; urgency=low
+
+  * new upstream release
+
+  [ Mark Purcell ]
+  * Fixes: Crashes on assigning icon to tag (Closes: #393505)
+
+  [ Achim Bohnet ]
+  * remove dcraw dependency. digikam now includes/uses an adapted
+    version
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 20 Oct 2006 20:05:31 +0100
+
+digikam (1:0.9.0~beta2-1) experimental; urgency=low
+
+  * new upstream release
+
+  [Achim Bohnet]
+  * debian/patches/kbugs131550.patch: removed. Included upstream
+  * debian/patches/11_only_-lqt-mt.diff: updated
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 22 Sep 2006 05:03:17 +0100
+
+digikam (1:0.9-beta1-r1-1) experimental; urgency=low
+
+  [ Mark Purcell ]
+  * New Upstream Release
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri,  4 Aug 2006 23:34:51 +0100
+
+digikam (1:0.9-beta1-3) experimental; urgency=low
+
+  [ Mark Purcell ]
+  * Pull powerpc fix from http://bugs.kde.org/show_bug.cgi?id=131550
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri,  4 Aug 2006 21:49:24 +0100
+
+digikam (1:0.9-beta1-2) experimental; urgency=low
+
+  [ Mark Purcell ]
+  * Recommends: digikamimageplugins (>> 0.9)
+  * Upload to experimental this time :-(
+  * Add Build-Depends: libltdl3-dev
+    - FTBFS: grep: /usr/lib/libltdl.la: No such file or directory (Closes:
+    #379501)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Sun, 23 Jul 2006 23:38:13 +0100
+
+digikam (0.9-beta1-1) unstable; urgency=low
+
+  [ Mark Purcell ]
+  * New upstream release
+  * Fixes:
+    - Digikam doesn't save modified Tiff images (Closes: #375982)
+    - "Toggle Full Screen" should be in the View menu (Closes: #378477)
+  * Use upstream servicemenus for uploading
+  * Add Build-Depends: libexiv2-dev, liblcms1-dev
+  * Remove Build-Depends: libimlib2-dev, libkexif1-dev
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri, 21 Jul 2006 19:57:37 +0100
+
+digikam (0.8.2-1) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * new upstream release
+  * adapt debian/patches/11_only_-lqt-mt.diff to apply cleanly
+  * debian/rules:
+    - remove applnk/ workaround: digikam.desktop is now properly
+      installed in applications/kde/
+    - remove x-raw.desktop removal. No longer delivered by upstream
+  * debian/control: x-raw.desktop is in kdelibs >= 4:3.5.1-3 so add
+    a versioned depend on it.
+
+  [ Mark Purcell ]
+  * Include translators in debian/copyright (problem with unicode though)
+  * Fixes:
+    - needs to call update-desktop-files in postinst (Closes: #344092)
+    - fails to start with "albumtreestate.bin not found" (Closes: #340567)
+    - general disfunctionning (Closes: #309726)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 20 Jul 2006 06:59:38 +0100
+
+digikam (0.8.1+0.8.2-rc1-2) unstable; urgency=low
+
+  * Depends: libgphoto2-2-dev
+    - Fixes: camera interface breaks with libgphoto 2.2.0 (Closes: #374460)
+  * Reclose fixed bugs:
+    - Rotation and Resaving --> Loss of EXIF info (Closes: #349450)
+    - Hash marks ('#') in album names cause download problems (Closes:
+    #348887)
+    - Unlike other rotation in the program (thanks to kipi), auto rotate
+    is LOSSY (Closes: #325979)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed, 21 Jun 2006 00:39:01 +1000
+
+digikam (0.8.1+0.8.2-rc1-1) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * new upstream release.
+      o Closes: #349450: Rotation and Resaving --> Loss of EXIF info 
+      o Closes: #348887: Hash marks ('#') in album names cause download
+        problems 
+  * debian/rules: use --disalbe-final.  This fixes meta data loss:
+    Digikam deletes EXIFs when auto-rotating on import
+    http://bugs.kde.org/show_bug.cgi?id=126326 and
+    https://launchpad.net/distros/ubuntu/+source/digikam/+bug/34462
+  * Removed patches now included upstream:
+     o 20_kdesvn_r531782_fix_16bit_tiff_thumbnails.diff
+     o 21_kdesvn_r532147_fix_16bit_tiff_umscamera.diff
+     o 22_kdesvn_r532959_fix_16bit_tiff_imageeditor.diff
+  * Add patch debian/patches/11_only_-lqt-mt.diff:
+    By default configure sets LIB_QT to 
+    LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
+    Fix configure so it's set to LIB_QT=-lqt-mt. Sort of a start
+    of a relibtooliztion.
+    
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed, 10 May 2006 01:28:55 +0200
+
+digikam (0.8.1+0.8.2-beta1-2) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * Pull some fixes from upstream svn:
+    + 20_kdesvn_r531782_fix_16bit_tiff_thumbnails.diff
+    + 21_kdesvn_r532147_fix_16bit_tiff_umscamera.diff
+    + 22_kdesvn_r532959_fix_16bit_tiff_imageeditor.diff
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon, 24 Apr 2006 23:29:16 +0200
+
+digikam (0.8.1+0.8.2-beta1-1) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * new upstream release.  Fixes:
+     o Closes: #355886  Fixes search, after introduction rating:
+       search only found rated images
+     o Closes: #351931  digikam confused : tries to open JPG files with dcraw
+     o digikam now fail to display pictures, and needlessly invoke dcraw
+        too (Closes: #364215)
+  * Removed the patches that are in new upstream release:
+     o 10_kdesvn_r507591_fix_jpeg_on_ppc.diff
+     o 11_kdesvn_r508791_add_more_options_to_albumproperties.diff
+     o 12_kdesvn_r505430_fix_search.diff
+  * debian rules: replace deletion of empty api-docs dir tree with one
+    simple rm -rf
+  * fix typo in long description. (Closes: #363256)
+  * Depend on dcraw instead of only recommend it. This digikam version
+    actually checks dcraw existance on startup, due to extented RAW
+    support
+
+  [ Mark Purcell ]
+  * Provide
+    /usr/share/apps/konqueror/servicemenus/digikam_upload_photos.desktop
+    to allow direct upload from removable media
+  * lintian overrides: package-name-doesnt-match-sonames
+  * Update debian/watch
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon, 24 Apr 2006 20:04:29 +0100
+
+digikam (0.8.1-4) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * recommend dcraw
+  * patches/10_kdesvn_r507545_fix_jpeg_on_ppc.diff removed: breaks AMD64.
+  * patches/10_kdesvn_r507591_fix_jpeg_on_ppc.diff 2nd try.  Works on
+    PPC without breaking AMD64 (Closes: #354173).  Thanks to Rodney Gordon
+    II and Fabrice Flore-Thebault for testing.
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Mon,  6 Mar 2006 21:48:37 +0100
+
+digikam (0.8.1-3) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * Remove version from build-dep on libkexif and libkipi.  Lastest
+    libkexif and libkipi don't refer to libXft.la anymore.
+  * remove image/x-raw.desktop. It is now in upstream's stable branch
+    of kdelibs (see http://bugs.kde.org/show_bug.cgi?id=121242).
+    Debian's kdelibs >= 4:3.5.1-3 contains this file already.
+  * patches/10_kdesvn_r507545_fix_jpeg_on_ppc.diff: fix endiness problem
+    with jpeg. Fix:  (Closes: #351931)
+
+  [ Tom Albers ]
+  * patches/11_kdesvn_r508791_add_more_options_to_albumproperties.diff
+    adds two buttons to album properties to set the date picker to oldest
+    or newest image in the album.
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed,  8 Feb 2006 01:46:51 +0100
+
+digikam (0.8.1-2) unstable; urgency=low
+
+  * Add versioned build depends for libkexif & libkipi to remove
+    dependancy on missing libXft.la
+    - digikam - FTBFS: libtool: link: `/usr/lib/libXft.la' is not a valid
+    libtool archive (Closes: #350873)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed,  1 Feb 2006 20:36:25 +0000
+
+digikam (0.8.1-1) unstable; urgency=low
+
+  [ Tom Albers ]
+  * New upstream release
+  * digikam.manpage: add new option --download-from
+  * copyright: update upstream authors, add yours truely to
+    debian packagers
+  * rules: enable enable-final build again
+
+  [ Achim Bohnet ]
+  * debian/copyright updated. Copyright and license audit
+  * debian/digikam.manpage: --download-from: document KDE automounting
+    for system: and media: URLs.
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 12 Jan 2006 22:31:18 +0100
+
+digikam (0.8.0-1-1) unstable; urgency=low
+
+  * new upstream release
+
+  [ Achim Bohnet ]
+  * Fixes bug reports:
+     + Rotating updates image but not thumbnail (Closes: #336895)
+     + 0.8.x would be nice (Closes: #325262)
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Wed, 23 Nov 2005 01:33:26 +0100
+
+digikam (0.8.0-0rc-1) experimental; urgency=low
+
+  * new upstream release
+  * mention new 0.8 features tagging and searching in long description
+  * remove 01_fix_keyboardfocus_in_albumview.diff, fixed upstream
+  * remove build-dep on libgdbm-dev: No longer needed in 0.8
+  * remove the empty apidocs dirtree from /usr/share/doc/kde
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Fri,  4 Nov 2005 14:50:31 +0100
+
+digikam (0.8.0-0beta2-1) experimental; urgency=low
+
+  * New upstream release
+  * Merge 0.7.4-5 packaging and changes
+  * build-deps on libkipi and libkexif: remove versioned dependency. No
+    longer necessary
+  * conflict with all digikamimageplugin releases << 0.8
+  * Remove patches:
+       o 00_showfoto_enable-final-fix.diff: was applied upstream
+       o visibility.diff: new admin/* disables automaticly visibility
+         because qt isn't compiled with visibility enabled
+  * New patch 01_fix_keyboardfocus_in_albumview.diff: stolen from
+    upstream svn. Fixes KDE bug #112971.
+  * disable --enable-final, it is broken again.
+
+ -- Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>  Thu, 22 Sep 2005 01:24:52 +0200
+
+digikam (0.8.0-0beta1-1) experimental; urgency=low
+
+  * New upstream release
+  * Beta package to experimental
+  * Backout Package split: libdigikam-dev & libdigikam0 (See #324592)
+
+ -- Mark Purcell <msp@debian.org>  Fri,  2 Sep 2005 22:06:04 +0100
+
+digikam (0.7.4-5) unstable; urgency=low
+
+  [ Debian KDE Extras Team ]
+  * Pkg now maintained by Debian KDE Extras Team
+
+  [ Achim Bohnet ]
+  * Now that the pkgs are build on all archs, fix build dependencies
+     + kdelibs4-dev: remove version
+     + libkexif1-dev (>= 0.2-1), libkipi0-dev (>= 0.1-1): (re)set
+       versions to last API change. (Helps backporting.)
+  * remove debian/dirs, not needed because dh_install creates the
+    missing usr/share/pixmap dir
+  * rules: remove --list-missing for dh_install now that libdigikam{,-dev}
+    is backout.
+  * document in lintian override why libdigikam{,-dev} is not used
+    (details in #324592)
+
+  [ Mark Purcell ]
+  * Backout Package split: libdigikam-dev & libdigikam0
+    (Closes: #326786)
+  * debian/rules enable DEB_CONFIGURE_USER_FLAGS
+  * Renable debian/patches/visibility.diff for 0.7.4
+  * Recommends: kdeprint, konqueror
+
+ -- Mark Purcell <msp@debian.org>  Sat, 17 Sep 2005 22:09:19 +0100
+
+digikam (0.7.4-4) unstable; urgency=low
+
+  * Add Depends: to libdigikam0 package as requested by NEW
+  * Split off Package: libdigikam-dev & libdigikam0
+    - Libraries should be split in a lib and -dev package. (Closes:
+    #324592)
+  * fix lintian old-fsf-address-in-copyright-file
+  * Add Recommends: kdebase
+
+ -- Mark Purcell <msp@debian.org>  Thu,  1 Sep 2005 07:49:32 +0100
+
+digikam (0.7.4-3) unstable; urgency=low
+
+  * Update libdigikam.install & libdigikam-dev.install for missing
+    /usr/lib/kde3
+
+ -- Mark Purcell <msp@debian.org>  Thu, 25 Aug 2005 23:17:21 +0100
+
+digikam (0.7.4-2) unstable; urgency=low
+
+  * Split off Package: libdigikam-dev & libdigikam0
+    - Libraries should be split in a lib and -dev package. (Closes:
+    #324592)
+
+ -- Mark Purcell <msp@debian.org>  Thu, 25 Aug 2005 20:50:52 +0100
+
+digikam (0.7.4-1) unstable; urgency=low
+
+  [ Achim Bohnet ]
+  * new upstream release.
+  * Upstream split code and docs into two tarballs.
+    Handbooks and their translations are now in it's own package
+    Shrinks package to 10% of combined size. (Closes: #314588)
+    Handbooks are now available in the new digikam-doc package.
+  * control: conflict with digikamimageplugins << 0.7.2.9999
+  * remove backport patch patches/01_fix-two-or-fourfold_menu_entries.diff.
+    Fixed upstream in 0.7.3
+  * ltdl kde bug is fixed in KDE 3.4:  Remove Depends on libimlib2-dev
+    and build-dep on KDE >= 4:3.4.0 (Closes: #288685, #310378)
+  * remove libltdl3-dev build-dep
+  * New homepage URL in long description
+  * add: patches/00_showfoto_enable-final-fix.diff
+  * digikam - digikam-doc tarball split
+     + Add a note to the manpages that the handbooks are in package
+       digikam-doc
+     + copyright: remove part about documentation
+     + control: update depends, suggests and build-depends
+  * licenses/copyright review
+
+  [ Mark Purcell ]
+  * C++ transition package
+  * Add debian/watch
+  * Build-Depends: libkexif1-dev (>= 0.2.1-5)
+  *  libkipi0-dev (>= 0.1.1-3), kdelibs4-dev (>= 4:3.4.2-1)
+  * Disable KDE_ENABLE_HIDDEN_VISIBILITY --
+              debian/patches/visibility.diff
+  * Build-Depends: automake1.9
+
+ -- Mark Purcell <msp@debian.org>  Sat, 20 Aug 2005 21:43:17 +0100
+
+digikam (0.7.2-4) unstable; urgency=medium
+
+  * patches/01_fix-two-or-fourfold_menu_entries.diff:
+    fix double and even quadruple appearances of menu entries.
+    Backport of http://bugs.kde.org/show_bug.cgi?id=103147
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 11 May 2005 13:55:04 +0200
+
+digikam (0.7.2-3) unstable; urgency=low
+
+  * move digikam.desktop file to /usr/share/applications/kde/
+    The desktop file is already XDG compliant.  (Closes: #271562)
+  * fix grammar in long description.  Thx Justin!  (Closes: #300122)
+  * Add 16x16 and 32x32 xpm icons for debian menu file
+    (showfoto icons are from KDE cvs)
+  * manpage: add a note that autodetection does not work with
+    USB mass storage cameras.
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 27 Apr 2005 23:41:39 +0200
+
+digikam (0.7.2-2) unstable; urgency=low
+
+  * debian/TODO: clean
+  * digikam manpage: better --detect-camera description
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Thu, 10 Mar 2005 02:39:02 +0100
+
+digikam (0.7.2-1) unstable; urgency=low
+
+  * new upstream release
+  * added manpage and menu entry for showfoto
+  * debian/copyright
+     o updated copyrights for 2005
+     o added new copyright holder of new code
+     o added (c) and license of handbook and copy of GFDL
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed,  2 Mar 2005 23:19:51 +0100
+
+digikam (0.7.2~beta1+cvs20050216-1) experimental; urgency=low
+
+  * new cvs snapshot
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 16 Feb 2005 17:44:05 +0100
+
+digikam (0.7.2~beta1+cvs20050215-1) experimental; urgency=low
+
+  * new upstream beta1 release + cvs fixes
+  * HACK: add doc and po dirs from beta1
+  * recommend khelpcenter so hand book can be displayed
+  * digikam manpage:
+      + fix UTF-8 '-' issue and update options
+      + document --dectect-camera option
+  * add simple showfoto manpage
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 16 Feb 2005 00:14:30 +0100
+
+digikam (0.7.1+cvs20050209-1) experimental; urgency=low
+
+  * cvs snapshot (new upstream release beta1 tarball is broken)
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed,  9 Feb 2005 01:16:29 +0100
+
+digikam (0.7.1+cvs20050202-1) experimental; urgency=low
+
+  * new cvs snapshot short before beta1 release
+  * working for me but still lots of polishing/updating
+    for debian necessary
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Thu,  3 Feb 2005 00:02:59 +0100
+
+digikam (0.7.1-1~experimental1) experimental; urgency=low
+
+  * new upstream release
+  * depend on libkexif1. Add patch to load right libkexif
+    translations
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Thu,  6 Jan 2005 00:58:15 +0100
+
+digikam (0.7-3) unstable; urgency=low
+
+  * Digikam Depends: libimlib2-dev to workaround current imlib2 issues
+    (See Bug#283339)
+
+ -- Mark Purcell <msp@debian.org>  Wed,  1 Dec 2004 21:25:37 +1100
+
+digikam (0.7-2) unstable; urgency=low
+
+  * Rebuild for KDE 3.3.x
+
+ -- Mark Purcell <msp@toshiba.purcell.id.au>  Wed,  1 Dec 2004 21:24:50 +1100
+
+digikam (0.7-1~kalyxo2) unstable; urgency=low
+
+  * update spanish translation as requested by Quique
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue, 23 Nov 2004 22:34:34 +0100
+
+digikam (0.7-1~kalyxo1) unstable; urgency=low
+
+  * new upstream release (Closes: #280409)
+  * New co-maintainers:
+      Achim Bohnet <ach@mpe.mpg.de>
+      Mark Purcell <msp@debian.org>
+    (see #280409)
+  * add digikam manpage
+  * 0.7 release fixes following bugs:
+     * closes: #260121: Cannot download images to folders with
+                       national characters
+     * closes: #238967: digikam: not displaying disconnect
+  * build with --disable-debug to get rid of 'loading plugin ...'
+    messages.
+  * remove all debian/patches/*.  They are implemented upstream.
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue, 16 Nov 2004 21:58:53 +0100
+
+digikam (0.7-0.1) unstable; urgency=low
+
+  * build-dep added: libkipi0-dev
+  * recommends: added digikamimageplugins
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue,  9 Nov 2004 01:28:32 +0100
+
+digikam (0.6.99.cvs20040728-3) experimental; urgency=low
+
+  * build-dep: add libtiff4-dev
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Fri, 22 Oct 2004 10:13:16 +0200
+
+digikam (0.6.99.cvs20040728-2) experimental; urgency=low
+
+  * remove sqlite/config.h. it's fixed upstream in via
+    configure.in.in
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 28 Jul 2004 15:24:00 +0200
+
+digikam (0.6.99.cvs20040728-1) experimental; urgency=low
+
+  * more TODOs
+  * add sqlite/config.h in debian/patches (it's ignored by cvs2dist)
+  * remove guibiulder build fix. applied upstream
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 28 Jul 2004 13:18:27 +0200
+
+digikam (0.6.99.cvs20040727-2) experimental; urgency=low
+
+  * rebuild with libsqlite* deinstalled
+  * disalbed threading in sqllite.h
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 28 Jul 2004 01:53:25 +0200
+
+digikam (0.6.99.cvs20040727-1) experimental; urgency=low
+
+  * sync with cvs
+  * added debian/patches dir and cdbs simple-patchsys.mk rule
+  * added patch to fix build after guibuilder src move
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue, 27 Jul 2004 22:28:58 +0200
+
+digikam (0.6.99.cvs20040726-1) experimental; urgency=low
+
+  * NMU (experimental cvs build until 0.7 release)
+  * update from kde cvs 24-Jul-2004
+  * add build-dep on libgdbm-dev
+  * --disable-rpath for configure
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue, 27 Jul 2004 01:05:43 +0200
+
+digikam (0.6.99.cvs20040721-1) unstable; urgency=low
+
+  * build from CVS snaptop
+  * experimental pkging
+  * use cdbs for rules file
+  * add debian/TODO as long there's something to do ;)
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 21 Jul 2004 03:21:06 +0200
+
+digikam (0.6.2-4) unstable; urgency=low
+
+  * Add conflicts against digikamplugins <= 0.6.0 (Closes: #258348)
+
+ -- Paul Telford <pxt@debian.org>  Thu, 23 Sep 2004 17:21:39 +0000
+
+digikam (0.6.2-2sarge1) testing-proposed-updates; urgency=medium
+
+  * Rebuild to get back into Sarge due to kdelibs/libtiff dependencies (Closes: #268774)
+
+ -- Paul Telford <pxt@debian.org>  Mon, 30 Aug 2004 15:35:52 +0000
+
+digikam (0.6.2-3) unstable; urgency=medium
+
+  * Rebuild against new imlib (libtiff transition) (Closes: #262796)
+
+ -- Paul Telford <pxt@debian.org>  Mon, 02 Aug 2004 14:48:55 +0000
+
+digikam (0.6.2-2) unstable; urgency=low
+
+  * Fixed broken autoconf build stuff (Closes: #258285)
+
+ -- Paul Telford <pxt@debian.org>  Thu,  8 Jul 2004 10:51:39 -0700
+
+digikam (0.6.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #243077, #255601)
+
+ -- Paul Telford <pxt@debian.org>  Wed, 30 Jun 2004 12:05:19 -0700
+
+digikam (0.6.0-5) unstable; urgency=low
+
+  * Fix to build against new libexif (Closes: #256307, #256407)
+
+ -- Paul Telford <pxt@debian.org>  Mon, 28 Jun 2004 12:02:47 -0700
+
+digikam (0.6.0-4) unstable; urgency=low
+
+  * Really fixed broken sparc build this time
+  * Updated libtool to fix arm build (Closes: #239599)
+
+ -- Paul Telford <pxt@debian.org>  Fri, 26 Mar 2004 09:20:23 -0800
+
+digikam (0.6.0-3) unstable; urgency=low
+
+  * Fix broken build on sparc 
+
+ -- Paul Telford <pxt@debian.org>  Tue, 16 Mar 2004 23:56:16 +0000
+
+digikam (0.6.0-2) unstable; urgency=low
+
+  * Fix broken Build-Depends
+
+ -- Paul Telford <pxt@debian.org>  Mon, 23 Feb 2004 15:22:59 +0000
+
+digikam (0.6.0-1) unstable; urgency=low
+
+  * v0.6 official release
+  * Now adds a Gnome menu entry (Closes: #228247)
+
+ -- Paul Telford <pxt@debian.org>  Tue, 10 Feb 2004 13:07:15 -0800
+
+digikam (0.6-0.cvs20031216.3) experimental; urgency=low
+
+  * recompiled for experimental
+
+ -- Paul Telford <pxt@debian.org>  Thu, 01 Jan 2004 17:34:28 -0800
+
+digikam (0.6-0.cvs20031216.2) stable; urgency=low
+
+  * recompiled without unofficial libxrender1.1
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 17 Dec 2003 23:46:47 +0100
+
+digikam (0.6-0.cvs20031216) stable; urgency=low
+
+  * sync with cvs
+  * remove po/*/*.gmo as not done by make distclean
+  * replace debian/rules with a dh_make skeleton. In the old
+    version dpkg-genchanges -b could not creating debian/files
+  * install AUTHORS and ChangeLog to /usr/share/doc/digikam
+  * added digikam homepage URL to control
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue, 16 Dec 2003 23:47:43 +0100
+
+digikam (0.6-0.cvs20031202) unstable; urgency=low
+
+  * sync with cvs
+  * fix build-deps for woody (add | imlib-dev)
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue,  2 Dec 2003 22:04:22 +0100
+
+digikam (0.6-0.cvs20031118) unstable; urgency=low
+
+  * sync with CVS
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Tue, 18 Nov 2003 18:32:29 +0100
+
+digikam (0.6-0.cvs20031106) unstable; urgency=low
+
+  * sync with CVS
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Thu,  6 Nov 2003 13:23:54 +0100
+
+digikam (0.6-0.cvs20031103) unstable; urgency=low
+
+  * sync with CVS
+  * create orig.tar file from CVS source
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Mon,  3 Nov 2003 19:53:11 +0100
+
+digikam (0.6-0.cvs20031017) unstable; urgency=low
+
+  * added TODO.Debian
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Mon, 20 Oct 2003 15:58:57 +0200
+
+digikam (0.6-0.cvs20031015) unstable; urgency=low
+
+  * sync with Gilles cvs snapshot
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 15 Oct 2003 23:51:34 +0200
+
+digikam (0.6.beta1-20030902) unstable; urgency=low
+
+  * sync with cvs
+  * more build-dep additions: poxml, libltdl3-dev
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Wed, 15 Oct 2003 23:49:50 +0200
+
+digikam (0.6-beta1-1.1) unstable; urgency=low
+
+  * make it depend on imlib2 so it build with woody kde 3.*
+  * Add missing gphoto2-dev | libgphoto2-2-dev to build-dep (for gphoto2-*-config)
+    (I hope that '|' makes it work in woody and unstable)
+  * Add missing poxml (for xml2po)
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Thu,  8 May 2003 19:09:17 +0200
+
+digikam (0.6-beta1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Renchi Raju <renchi@pooh.tam.uiuc.edu>  Wed, 26 Feb 2003 21:48:07 -0600
+
+digikam (0.5.1-1) unstable; urgency=low
+
+  * New Release.
+
+ -- Renchi Raju <renchi@green.tam.uiuc.edu>  Tue, 02 Sep 2002 11:02:14 -0500
+
+digikam (0.5.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Renchi Raju <renchi@green.tam.uiuc.edu>  Fri, 15 Jul 2002 12:03:04 -0500
+
--- digikam-0.9.4.orig/debian/compat
+++ digikam-0.9.4/debian/compat
@@ -0,0 +1 @@
+5
--- digikam-0.9.4.orig/debian/showfoto.manpages
+++ digikam-0.9.4/debian/showfoto.manpages
@@ -0,0 +1 @@
+debian/showfoto.manpage
--- digikam-0.9.4.orig/debian/watch
+++ digikam-0.9.4/debian/watch
@@ -0,0 +1,6 @@
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+http://sf.net/digikam/digikam-(\d+.*)\.tar\.bz2 debian svn-upgrade
--- digikam-0.9.4.orig/debian/showfoto.install
+++ digikam-0.9.4/debian/showfoto.install
@@ -0,0 +1,4 @@
+usr/bin/showfoto
+usr/share/apps/showfoto
+usr/share/applications/kde/showfoto.desktop
+usr/share/icons/hicolor/*/apps/showfoto.png
--- digikam-0.9.4.orig/configure.in
+++ digikam-0.9.4/configure.in
@@ -393,7 +393,7 @@
 
 if test x$included_sqlite3 = xno; then
     if test x$PKGCONFIGFOUND = xyes; then
-        PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.5, have_sqlite3=yes,have_sqlite3=no)
+        PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.4.2, have_sqlite3=yes,have_sqlite3=no)
 
         if test x$have_sqlite3 = xyes; then
             ## AC_DEFINE(HAVE_SQLITE3, 1, [have SQLite3 database library])
--- digikam-0.9.4.orig/digikam/showfoto/icons/Makefile.in
+++ digikam-0.9.4/digikam/showfoto/icons/Makefile.in
@@ -514,6 +514,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=hi22-app-showfoto.png Makefile.in hi48-mime-raw.png hi48-app-showfoto.png hi32-app-showfoto.png hi64-mime-raw.png hi128-app-showfoto.png hi16-app-showfoto.png hi64-app-showfoto.png hi32-mime-raw.png hi22-mime-raw.png Makefile.am 
 
@@ -522,56 +523,56 @@
 
 #>+ 52
 install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/22x22/apps
-	$(INSTALL_DATA) $(srcdir)/hi22-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/22x22/apps/showfoto.png
-	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/22x22/mimetypes
-	$(INSTALL_DATA) $(srcdir)/hi22-mime-raw.png $(DESTDIR)$(showfotoicondir)/hicolor/22x22/mimetypes/raw.png
 	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/64x64/apps
 	$(INSTALL_DATA) $(srcdir)/hi64-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/64x64/apps/showfoto.png
-	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/128x128/apps
-	$(INSTALL_DATA) $(srcdir)/hi128-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/128x128/apps/showfoto.png
+	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/22x22/apps
+	$(INSTALL_DATA) $(srcdir)/hi22-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/22x22/apps/showfoto.png
+	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/48x48/mimetypes
+	$(INSTALL_DATA) $(srcdir)/hi48-mime-raw.png $(DESTDIR)$(showfotoicondir)/hicolor/48x48/mimetypes/raw.png
+	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/32x32/apps
+	$(INSTALL_DATA) $(srcdir)/hi32-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/32x32/apps/showfoto.png
 	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/32x32/mimetypes
 	$(INSTALL_DATA) $(srcdir)/hi32-mime-raw.png $(DESTDIR)$(showfotoicondir)/hicolor/32x32/mimetypes/raw.png
-	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/48x48/apps/showfoto.png
-	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/64x64/mimetypes
-	$(INSTALL_DATA) $(srcdir)/hi64-mime-raw.png $(DESTDIR)$(showfotoicondir)/hicolor/64x64/mimetypes/raw.png
+	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/128x128/apps
+	$(INSTALL_DATA) $(srcdir)/hi128-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/128x128/apps/showfoto.png
 	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/16x16/apps
 	$(INSTALL_DATA) $(srcdir)/hi16-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/16x16/apps/showfoto.png
-	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/hi32-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/32x32/apps/showfoto.png
-	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/48x48/mimetypes
-	$(INSTALL_DATA) $(srcdir)/hi48-mime-raw.png $(DESTDIR)$(showfotoicondir)/hicolor/48x48/mimetypes/raw.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-	$(INSTALL_DATA) $(srcdir)/hi22-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/showfoto.png
+	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/64x64/mimetypes
+	$(INSTALL_DATA) $(srcdir)/hi64-mime-raw.png $(DESTDIR)$(showfotoicondir)/hicolor/64x64/mimetypes/raw.png
+	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/hi48-app-showfoto.png $(DESTDIR)$(showfotoicondir)/hicolor/48x48/apps/showfoto.png
+	$(mkinstalldirs) $(DESTDIR)$(showfotoicondir)/hicolor/22x22/mimetypes
+	$(INSTALL_DATA) $(srcdir)/hi22-mime-raw.png $(DESTDIR)$(showfotoicondir)/hicolor/22x22/mimetypes/raw.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
 	$(INSTALL_DATA) $(srcdir)/hi64-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/showfoto.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+	$(INSTALL_DATA) $(srcdir)/hi22-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/showfoto.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+	$(INSTALL_DATA) $(srcdir)/hi32-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/showfoto.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 	$(INSTALL_DATA) $(srcdir)/hi128-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/showfoto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/showfoto.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
 	$(INSTALL_DATA) $(srcdir)/hi16-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/showfoto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/hi32-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/showfoto.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/hi48-app-showfoto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/showfoto.png
 
 uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/22x22/apps/showfoto.png
-	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/22x22/mimetypes/raw.png
 	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/64x64/apps/showfoto.png
-	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/128x128/apps/showfoto.png
+	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/22x22/apps/showfoto.png
+	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/48x48/mimetypes/raw.png
+	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/32x32/apps/showfoto.png
 	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/32x32/mimetypes/raw.png
-	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/48x48/apps/showfoto.png
-	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/64x64/mimetypes/raw.png
+	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/128x128/apps/showfoto.png
 	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/16x16/apps/showfoto.png
-	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/32x32/apps/showfoto.png
-	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/48x48/mimetypes/raw.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/showfoto.png
+	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/64x64/mimetypes/raw.png
+	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/48x48/apps/showfoto.png
+	-rm -f $(DESTDIR)$(showfotoicondir)/hicolor/22x22/mimetypes/raw.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/showfoto.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/showfoto.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/showfoto.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/showfoto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/showfoto.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/showfoto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/showfoto.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/showfoto.png
 
 #>+ 15
 force-reedit:
--- digikam-0.9.4.orig/digikam/showfoto/setup/Makefile.in
+++ digikam-0.9.4/digikam/showfoto/setup/Makefile.in
@@ -651,6 +651,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 setup.moc: $(srcdir)/setup.h
 	$(MOC) $(srcdir)/setup.h -o setup.moc
--- digikam-0.9.4.orig/digikam/showfoto/Makefile.in
+++ digikam-0.9.4/digikam/showfoto/Makefile.in
@@ -880,6 +880,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 showfoto.moc: $(srcdir)/showfoto.h
 	$(MOC) $(srcdir)/showfoto.h -o showfoto.moc
--- digikam-0.9.4.orig/digikam/showfoto/pics/Makefile.in
+++ digikam-0.9.4/digikam/showfoto/pics/Makefile.in
@@ -541,6 +541,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=menusidepixmap.xcf Makefile.in showfoto-splash.png showfoto-splash.xcf menusidepixmap.png Makefile.am 
 
--- digikam-0.9.4.orig/digikam/themedesigner/Makefile.in
+++ digikam-0.9.4/digikam/themedesigner/Makefile.in
@@ -691,6 +691,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 themediconview.moc: $(srcdir)/themediconview.h
 	$(MOC) $(srcdir)/themediconview.h -o themediconview.moc
--- digikam-0.9.4.orig/digikam/utilities/scripts/Makefile.in
+++ digikam-0.9.4/digikam/utilities/scripts/Makefile.in
@@ -589,6 +589,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in digitaglinktree digitaglinktree.1 Makefile.am 
 
--- digikam-0.9.4.orig/digikam/utilities/hotplug/Makefile.in
+++ digikam-0.9.4/digikam/utilities/hotplug/Makefile.in
@@ -579,6 +579,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=digikam-download.desktop.in Makefile.in configure.in.in digikam-mount-and-download.desktop.in digikam-camera digikam-gphoto2-camera.desktop.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/utilities/slideshow/Makefile.in
+++ digikam-0.9.4/digikam/utilities/slideshow/Makefile.in
@@ -652,6 +652,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 slideshow.moc: $(srcdir)/slideshow.h
 	$(MOC) $(srcdir)/slideshow.h -o slideshow.moc
--- digikam-0.9.4.orig/digikam/utilities/batch/Makefile.in
+++ digikam-0.9.4/digikam/utilities/batch/Makefile.in
@@ -663,6 +663,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageinfojob.moc: $(srcdir)/imageinfojob.h
 	$(MOC) $(srcdir)/imageinfojob.h -o imageinfojob.moc
--- digikam-0.9.4.orig/digikam/utilities/setup/Makefile.in
+++ digikam-0.9.4/digikam/utilities/setup/Makefile.in
@@ -707,6 +707,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 setupslideshow.moc: $(srcdir)/setupslideshow.h
 	$(MOC) $(srcdir)/setupslideshow.h -o setupslideshow.moc
@@ -729,18 +730,18 @@
 mocs: setuptooltip.moc
 
 #>+ 3
-setupcamera.moc: $(srcdir)/setupcamera.h
-	$(MOC) $(srcdir)/setupcamera.h -o setupcamera.moc
+cameraselection.moc: $(srcdir)/cameraselection.h
+	$(MOC) $(srcdir)/cameraselection.h -o cameraselection.moc
 
 #>+ 2
-mocs: setupcamera.moc
+mocs: cameraselection.moc
 
 #>+ 3
-cameraselection.moc: $(srcdir)/cameraselection.h
-	$(MOC) $(srcdir)/cameraselection.h -o cameraselection.moc
+setupcamera.moc: $(srcdir)/setupcamera.h
+	$(MOC) $(srcdir)/setupcamera.h -o setupcamera.moc
 
 #>+ 2
-mocs: cameraselection.moc
+mocs: setupcamera.moc
 
 #>+ 3
 setupicc.moc: $(srcdir)/setupicc.h
@@ -821,7 +822,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  setupslideshow.moc setupcollections.moc setuptooltip.moc setupcamera.moc cameraselection.moc setupicc.moc setupidentity.moc setuplighttable.moc setupgeneral.moc setupdcraw.moc setup.moc setupmetadata.moc setupplugins.moc setupmime.moc setupiofiles.moc setupeditor.moc
+	-rm -f  setupslideshow.moc setupcollections.moc setuptooltip.moc cameraselection.moc setupcamera.moc setupicc.moc setupidentity.moc setuplighttable.moc setupgeneral.moc setupdcraw.moc setup.moc setupmetadata.moc setupplugins.moc setupmime.moc setupiofiles.moc setupeditor.moc
 
 #>+ 2
 KDE_DIST=setupmisc.h setupidentity.h setupplugins.h Makefile.in setupslideshow.h setupeditor.h setup.h setupicc.h setupmime.h setuptooltip.h setupgeneral.h setupdcraw.h setupcollections.h setuplighttable.h cameraselection.h setupcamera.h setupiofiles.h setupmetadata.h Makefile.am 
@@ -868,7 +869,7 @@
 
 
 #>+ 11
-libsetup_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cameraselection.cpp $(srcdir)/setupcamera.cpp $(srcdir)/setupmime.cpp $(srcdir)/setupplugins.cpp $(srcdir)/setupidentity.cpp $(srcdir)/setupgeneral.cpp $(srcdir)/setup.cpp $(srcdir)/setupcollections.cpp $(srcdir)/setupmetadata.cpp $(srcdir)/setupeditor.cpp $(srcdir)/setupmisc.cpp $(srcdir)/setupicc.cpp $(srcdir)/setupiofiles.cpp $(srcdir)/setupdcraw.cpp $(srcdir)/setupslideshow.cpp $(srcdir)/setuptooltip.cpp $(srcdir)/setuplighttable.cpp  setupslideshow.moc setupcollections.moc setuptooltip.moc cameraselection.moc setupcamera.moc setupicc.moc setupidentity.moc setuplighttable.moc setupgeneral.moc setup.moc setupdcraw.moc setupmetadata.moc setupmime.moc setupplugins.moc setupiofiles.moc setupeditor.moc
+libsetup_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cameraselection.cpp $(srcdir)/setupcamera.cpp $(srcdir)/setupmime.cpp $(srcdir)/setupplugins.cpp $(srcdir)/setupidentity.cpp $(srcdir)/setupgeneral.cpp $(srcdir)/setup.cpp $(srcdir)/setupcollections.cpp $(srcdir)/setupmetadata.cpp $(srcdir)/setupeditor.cpp $(srcdir)/setupmisc.cpp $(srcdir)/setupicc.cpp $(srcdir)/setupiofiles.cpp $(srcdir)/setupdcraw.cpp $(srcdir)/setupslideshow.cpp $(srcdir)/setuptooltip.cpp $(srcdir)/setuplighttable.cpp  setupslideshow.moc setupcollections.moc setuptooltip.moc setupcamera.moc cameraselection.moc setupicc.moc setupidentity.moc setuplighttable.moc setupgeneral.moc setup.moc setupdcraw.moc setupmetadata.moc setupmime.moc setupplugins.moc setupiofiles.moc setupeditor.moc
 	@echo 'creating libsetup_la.all_cpp.cpp ...'; \
 	rm -f libsetup_la.all_cpp.files libsetup_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libsetup_la.all_cpp.final; \
--- digikam-0.9.4.orig/digikam/utilities/Makefile.in
+++ digikam-0.9.4/digikam/utilities/Makefile.in
@@ -674,6 +674,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/utilities/imageeditor/tools/Makefile.in
+++ digikam-0.9.4/digikam/utilities/imageeditor/tools/Makefile.in
@@ -654,6 +654,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageprint.moc: $(srcdir)/imageprint.h
 	$(MOC) $(srcdir)/imageprint.h -o imageprint.moc
--- digikam-0.9.4.orig/digikam/utilities/imageeditor/editor/Makefile.in
+++ digikam-0.9.4/digikam/utilities/imageeditor/editor/Makefile.in
@@ -776,6 +776,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 editorwindow.moc: $(srcdir)/editorwindow.h
 	$(MOC) $(srcdir)/editorwindow.h -o editorwindow.moc
--- digikam-0.9.4.orig/digikam/utilities/imageeditor/Makefile.in
+++ digikam-0.9.4/digikam/utilities/imageeditor/Makefile.in
@@ -674,6 +674,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/utilities/imageeditor/canvas/Makefile.in
+++ digikam-0.9.4/digikam/utilities/imageeditor/canvas/Makefile.in
@@ -704,6 +704,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 dimginterface.moc: $(srcdir)/dimginterface.h
 	$(MOC) $(srcdir)/dimginterface.h -o dimginterface.moc
--- digikam-0.9.4.orig/digikam/utilities/cameragui/Makefile.in
+++ digikam-0.9.4/digikam/utilities/cameragui/Makefile.in
@@ -693,6 +693,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 renamecustomizer.moc: $(srcdir)/renamecustomizer.h
 	$(MOC) $(srcdir)/renamecustomizer.h -o renamecustomizer.moc
@@ -701,25 +702,18 @@
 mocs: renamecustomizer.moc
 
 #>+ 3
-albumselectdialog.moc: $(srcdir)/albumselectdialog.h
-	$(MOC) $(srcdir)/albumselectdialog.h -o albumselectdialog.moc
-
-#>+ 2
-mocs: albumselectdialog.moc
-
-#>+ 3
-animwidget.moc: $(srcdir)/animwidget.h
-	$(MOC) $(srcdir)/animwidget.h -o animwidget.moc
+cameraui.moc: $(srcdir)/cameraui.h
+	$(MOC) $(srcdir)/cameraui.h -o cameraui.moc
 
 #>+ 2
-mocs: animwidget.moc
+mocs: cameraui.moc
 
 #>+ 3
-cameraui.moc: $(srcdir)/cameraui.h
-	$(MOC) $(srcdir)/cameraui.h -o cameraui.moc
+albumselectdialog.moc: $(srcdir)/albumselectdialog.h
+	$(MOC) $(srcdir)/albumselectdialog.h -o albumselectdialog.moc
 
 #>+ 2
-mocs: cameraui.moc
+mocs: albumselectdialog.moc
 
 #>+ 3
 camerafolderview.moc: $(srcdir)/camerafolderview.h
@@ -743,6 +737,13 @@
 mocs: cameraiconview.moc
 
 #>+ 3
+animwidget.moc: $(srcdir)/animwidget.h
+	$(MOC) $(srcdir)/animwidget.h -o animwidget.moc
+
+#>+ 2
+mocs: animwidget.moc
+
+#>+ 3
 cameracontroller.moc: $(srcdir)/cameracontroller.h
 	$(MOC) $(srcdir)/cameracontroller.h -o cameracontroller.moc
 
@@ -758,7 +759,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  renamecustomizer.moc albumselectdialog.moc animwidget.moc cameraui.moc camerafolderview.moc freespacewidget.moc cameraiconview.moc cameracontroller.moc camerafolderdialog.moc
+	-rm -f  renamecustomizer.moc cameraui.moc albumselectdialog.moc camerafolderview.moc freespacewidget.moc cameraiconview.moc animwidget.moc cameracontroller.moc camerafolderdialog.moc
 
 #>+ 2
 KDE_DIST=animwidget.h cameraiconitem.h downloadsettingscontainer.h Makefile.in umscamera.h mtqueue.h camerafolderitem.h albumselectdialog.h cameraiconview.h camerafolderview.h camerainfodialog.h cameraui.h gpcamera.h cameracontroller.h renamecustomizer.h freespacewidget.h camerafolderdialog.h dkcamera.h gpiteminfo.h Makefile.am 
--- digikam-0.9.4.orig/digikam/utilities/lighttable/Makefile.in
+++ digikam-0.9.4/digikam/utilities/lighttable/Makefile.in
@@ -700,6 +700,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 lighttablewindow.moc: $(srcdir)/lighttablewindow.h
 	$(MOC) $(srcdir)/lighttablewindow.h -o lighttablewindow.moc
--- digikam-0.9.4.orig/digikam/imageplugins/whitebalance/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/whitebalance/Makefile.in
@@ -754,6 +754,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_whitebalance.moc: $(srcdir)/imageplugin_whitebalance.h
 	$(MOC) $(srcdir)/imageplugin_whitebalance.h -o imageplugin_whitebalance.moc
--- digikam-0.9.4.orig/digikam/imageplugins/noisereduction/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/noisereduction/Makefile.in
@@ -759,6 +759,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_noisereduction.moc: $(srcdir)/imageeffect_noisereduction.h
 	$(MOC) $(srcdir)/imageeffect_noisereduction.h -o imageeffect_noisereduction.moc
--- digikam-0.9.4.orig/digikam/imageplugins/channelmixer/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/channelmixer/Makefile.in
@@ -754,6 +754,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 channelmixer.moc: $(srcdir)/channelmixer.h
 	$(MOC) $(srcdir)/channelmixer.h -o channelmixer.moc
--- digikam-0.9.4.orig/digikam/imageplugins/restoration/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/restoration/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_restoration.moc: $(srcdir)/imageplugin_restoration.h
 	$(MOC) $(srcdir)/imageplugin_restoration.h -o imageplugin_restoration.moc
--- digikam-0.9.4.orig/digikam/imageplugins/blurfx/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/blurfx/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_blurfx.moc: $(srcdir)/imageplugin_blurfx.h
 	$(MOC) $(srcdir)/imageplugin_blurfx.h -o imageplugin_blurfx.moc
--- digikam-0.9.4.orig/digikam/imageplugins/emboss/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/emboss/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_emboss.moc: $(srcdir)/imageplugin_emboss.h
 	$(MOC) $(srcdir)/imageplugin_emboss.h -o imageplugin_emboss.moc
--- digikam-0.9.4.orig/digikam/imageplugins/perspective/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/perspective/Makefile.in
@@ -760,6 +760,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_perspective.moc: $(srcdir)/imageplugin_perspective.h
 	$(MOC) $(srcdir)/imageplugin_perspective.h -o imageplugin_perspective.moc
--- digikam-0.9.4.orig/digikam/imageplugins/texture/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/texture/Makefile.in
@@ -878,6 +878,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_texture.moc: $(srcdir)/imageeffect_texture.h
 	$(MOC) $(srcdir)/imageeffect_texture.h -o imageeffect_texture.moc
--- digikam-0.9.4.orig/digikam/imageplugins/texture/patterns/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/texture/patterns/Makefile.in
@@ -544,6 +544,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=bricks2-texture.png modern-texture.png burlap-texture.png fabric-texture.png paper2-texture.png wall-texture.png Makefile.in canvas-texture.png metalwire-texture.png bluejean-texture.png paper-texture.png moss-texture.png marble-texture.png marble2-texture.png bricks-texture.png cellwood-texture.png stone-texture.png Makefile.am 
 
--- digikam-0.9.4.orig/digikam/imageplugins/hotpixels/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/hotpixels/Makefile.in
@@ -762,6 +762,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 blackframeparser.moc: $(srcdir)/blackframeparser.h
 	$(MOC) $(srcdir)/blackframeparser.h -o blackframeparser.moc
@@ -770,18 +771,18 @@
 mocs: blackframeparser.moc
 
 #>+ 3
-blackframelistview.moc: $(srcdir)/blackframelistview.h
-	$(MOC) $(srcdir)/blackframelistview.h -o blackframelistview.moc
+imageplugin_hotpixels.moc: $(srcdir)/imageplugin_hotpixels.h
+	$(MOC) $(srcdir)/imageplugin_hotpixels.h -o imageplugin_hotpixels.moc
 
 #>+ 2
-mocs: blackframelistview.moc
+mocs: imageplugin_hotpixels.moc
 
 #>+ 3
-imageplugin_hotpixels.moc: $(srcdir)/imageplugin_hotpixels.h
-	$(MOC) $(srcdir)/imageplugin_hotpixels.h -o imageplugin_hotpixels.moc
+blackframelistview.moc: $(srcdir)/blackframelistview.h
+	$(MOC) $(srcdir)/blackframelistview.h -o blackframelistview.moc
 
 #>+ 2
-mocs: imageplugin_hotpixels.moc
+mocs: blackframelistview.moc
 
 #>+ 3
 imageeffect_hotpixels.moc: $(srcdir)/imageeffect_hotpixels.h
@@ -792,7 +793,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  blackframeparser.moc blackframelistview.moc imageplugin_hotpixels.moc imageeffect_hotpixels.moc
+	-rm -f  blackframeparser.moc imageplugin_hotpixels.moc blackframelistview.moc imageeffect_hotpixels.moc
 
 #>+ 2
 KDE_DIST=hotpixelfixer.h hotpixel.h Makefile.in blackframelistview.h imageeffect_hotpixels.h weights.h digikamimageplugin_hotpixels.desktop digikamimageplugin_hotpixels_ui.rc blackframeparser.h imageplugin_hotpixels.h Makefile.am 
@@ -839,7 +840,7 @@
 
 
 #>+ 11
-digikamimageplugin_hotpixels_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/blackframeparser.cpp $(srcdir)/weights.cpp $(srcdir)/hotpixelfixer.cpp $(srcdir)/imageplugin_hotpixels.cpp $(srcdir)/blackframelistview.cpp $(srcdir)/imageeffect_hotpixels.cpp  blackframeparser.moc imageplugin_hotpixels.moc blackframelistview.moc imageeffect_hotpixels.moc
+digikamimageplugin_hotpixels_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/blackframeparser.cpp $(srcdir)/weights.cpp $(srcdir)/hotpixelfixer.cpp $(srcdir)/imageplugin_hotpixels.cpp $(srcdir)/blackframelistview.cpp $(srcdir)/imageeffect_hotpixels.cpp  blackframeparser.moc blackframelistview.moc imageplugin_hotpixels.moc imageeffect_hotpixels.moc
 	@echo 'creating digikamimageplugin_hotpixels_la.all_cpp.cpp ...'; \
 	rm -f digikamimageplugin_hotpixels_la.all_cpp.files digikamimageplugin_hotpixels_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> digikamimageplugin_hotpixels_la.all_cpp.final; \
@@ -880,8 +881,8 @@
 blackframeparser.o: blackframeparser.moc 
 blackframeparser.lo: blackframeparser.moc 
 nmcheck-am: nmcheck
-imageplugin_hotpixels.lo: imageplugin_hotpixels.moc 
 blackframelistview.lo: blackframelistview.moc 
+imageplugin_hotpixels.lo: imageplugin_hotpixels.moc 
 imageplugin_hotpixels.o: imageplugin_hotpixels.moc 
 imageeffect_hotpixels.o: imageeffect_hotpixels.moc 
 blackframelistview.o: blackframelistview.moc 
--- digikam-0.9.4.orig/digikam/imageplugins/adjustlevels/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/adjustlevels/Makefile.in
@@ -754,6 +754,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 adjustlevels.moc: $(srcdir)/adjustlevels.h
 	$(MOC) $(srcdir)/adjustlevels.h -o adjustlevels.moc
--- digikam-0.9.4.orig/digikam/imageplugins/inpainting/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/inpainting/Makefile.in
@@ -754,6 +754,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_inpainting.moc: $(srcdir)/imageplugin_inpainting.h
 	$(MOC) $(srcdir)/imageplugin_inpainting.h -o imageplugin_inpainting.moc
--- digikam-0.9.4.orig/digikam/imageplugins/sheartool/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/sheartool/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_sheartool.moc: $(srcdir)/imageeffect_sheartool.h
 	$(MOC) $(srcdir)/imageeffect_sheartool.h -o imageeffect_sheartool.moc
--- digikam-0.9.4.orig/digikam/imageplugins/coreplugin/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/coreplugin/Makefile.in
@@ -907,6 +907,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_redeye.moc: $(srcdir)/imageeffect_redeye.h
 	$(MOC) $(srcdir)/imageeffect_redeye.h -o imageeffect_redeye.moc
@@ -915,13 +916,6 @@
 mocs: imageeffect_redeye.moc
 
 #>+ 3
-imageeffect_bcg.moc: $(srcdir)/imageeffect_bcg.h
-	$(MOC) $(srcdir)/imageeffect_bcg.h -o imageeffect_bcg.moc
-
-#>+ 2
-mocs: imageeffect_bcg.moc
-
-#>+ 3
 imageeffect_blur.moc: $(srcdir)/imageeffect_blur.h
 	$(MOC) $(srcdir)/imageeffect_blur.h -o imageeffect_blur.moc
 
@@ -929,32 +923,32 @@
 mocs: imageeffect_blur.moc
 
 #>+ 3
-imageplugin_core.moc: $(srcdir)/imageplugin_core.h
-	$(MOC) $(srcdir)/imageplugin_core.h -o imageplugin_core.moc
+imageeffect_autocorrection.moc: $(srcdir)/imageeffect_autocorrection.h
+	$(MOC) $(srcdir)/imageeffect_autocorrection.h -o imageeffect_autocorrection.moc
 
 #>+ 2
-mocs: imageplugin_core.moc
+mocs: imageeffect_autocorrection.moc
 
 #>+ 3
-imageeffect_iccproof.moc: $(srcdir)/imageeffect_iccproof.h
-	$(MOC) $(srcdir)/imageeffect_iccproof.h -o imageeffect_iccproof.moc
+imageeffect_bwsepia.moc: $(srcdir)/imageeffect_bwsepia.h
+	$(MOC) $(srcdir)/imageeffect_bwsepia.h -o imageeffect_bwsepia.moc
 
 #>+ 2
-mocs: imageeffect_iccproof.moc
+mocs: imageeffect_bwsepia.moc
 
 #>+ 3
-imageeffect_bwsepia.moc: $(srcdir)/imageeffect_bwsepia.h
-	$(MOC) $(srcdir)/imageeffect_bwsepia.h -o imageeffect_bwsepia.moc
+imageeffect_bcg.moc: $(srcdir)/imageeffect_bcg.h
+	$(MOC) $(srcdir)/imageeffect_bcg.h -o imageeffect_bcg.moc
 
 #>+ 2
-mocs: imageeffect_bwsepia.moc
+mocs: imageeffect_bcg.moc
 
 #>+ 3
-imageeffect_autocorrection.moc: $(srcdir)/imageeffect_autocorrection.h
-	$(MOC) $(srcdir)/imageeffect_autocorrection.h -o imageeffect_autocorrection.moc
+imageplugin_core.moc: $(srcdir)/imageplugin_core.h
+	$(MOC) $(srcdir)/imageplugin_core.h -o imageplugin_core.moc
 
 #>+ 2
-mocs: imageeffect_autocorrection.moc
+mocs: imageplugin_core.moc
 
 #>+ 3
 imageeffect_rgb.moc: $(srcdir)/imageeffect_rgb.h
@@ -964,8 +958,15 @@
 mocs: imageeffect_rgb.moc
 
 #>+ 3
+imageeffect_iccproof.moc: $(srcdir)/imageeffect_iccproof.h
+	$(MOC) $(srcdir)/imageeffect_iccproof.h -o imageeffect_iccproof.moc
+
+#>+ 2
+mocs: imageeffect_iccproof.moc
+
+#>+ 3
 clean-metasources:
-	-rm -f  imageeffect_redeye.moc imageeffect_bcg.moc imageeffect_blur.moc imageplugin_core.moc imageeffect_iccproof.moc imageeffect_bwsepia.moc imageeffect_autocorrection.moc imageeffect_rgb.moc
+	-rm -f  imageeffect_redeye.moc imageeffect_blur.moc imageeffect_autocorrection.moc imageeffect_bwsepia.moc imageeffect_bcg.moc imageplugin_core.moc imageeffect_rgb.moc imageeffect_iccproof.moc
 
 #>+ 2
 KDE_DIST=imageplugin_core.h Makefile.in digikamimageplugin_core.desktop digikamimageplugin_core_ui.rc Makefile.am 
@@ -1012,7 +1013,7 @@
 
 
 #>+ 11
-digikamimageplugin_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imageplugin_core.cpp $(srcdir)/imageeffect_bwsepia.cpp $(srcdir)/imageeffect_autocorrection.cpp $(srcdir)/imageeffect_rgb.cpp $(srcdir)/imageeffect_redeye.cpp $(srcdir)/imageeffect_blur.cpp $(srcdir)/imageeffect_iccproof.cpp $(srcdir)/imageeffect_bcg.cpp  imageeffect_redeye.moc imageeffect_blur.moc imageeffect_bcg.moc imageplugin_core.moc imageeffect_iccproof.moc imageeffect_bwsepia.moc imageeffect_autocorrection.moc imageeffect_rgb.moc
+digikamimageplugin_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imageplugin_core.cpp $(srcdir)/imageeffect_bwsepia.cpp $(srcdir)/imageeffect_autocorrection.cpp $(srcdir)/imageeffect_rgb.cpp $(srcdir)/imageeffect_redeye.cpp $(srcdir)/imageeffect_blur.cpp $(srcdir)/imageeffect_iccproof.cpp $(srcdir)/imageeffect_bcg.cpp  imageeffect_redeye.moc imageeffect_bcg.moc imageeffect_bwsepia.moc imageeffect_autocorrection.moc imageeffect_blur.moc imageeffect_rgb.moc imageplugin_core.moc imageeffect_iccproof.moc
 	@echo 'creating digikamimageplugin_core_la.all_cpp.cpp ...'; \
 	rm -f digikamimageplugin_core_la.all_cpp.files digikamimageplugin_core_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> digikamimageplugin_core_la.all_cpp.final; \
@@ -1049,12 +1050,12 @@
 
 #>+ 19
 imageeffect_rgb.o: imageeffect_rgb.moc 
-imageeffect_blur.lo: imageeffect_blur.moc 
 imageeffect_bcg.o: imageeffect_bcg.moc 
-imageeffect_autocorrection.o: imageeffect_autocorrection.moc 
+imageeffect_blur.lo: imageeffect_blur.moc 
 imageeffect_bwsepia.o: imageeffect_bwsepia.moc 
-imageeffect_bwsepia.lo: imageeffect_bwsepia.moc 
+imageeffect_autocorrection.o: imageeffect_autocorrection.moc 
 imageplugin_core.o: imageplugin_core.moc 
+imageeffect_bwsepia.lo: imageeffect_bwsepia.moc 
 imageeffect_bcg.lo: imageeffect_bcg.moc 
 nmcheck: 
 imageplugin_core.lo: imageplugin_core.moc 
--- digikam-0.9.4.orig/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/Makefile.in
@@ -908,6 +908,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=LICENCE Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.in
@@ -795,6 +795,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_sharpen.moc: $(srcdir)/imageeffect_sharpen.h
 	$(MOC) $(srcdir)/imageeffect_sharpen.h -o imageeffect_sharpen.moc
--- digikam-0.9.4.orig/digikam/imageplugins/coreplugin/hsl/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/coreplugin/hsl/Makefile.in
@@ -665,6 +665,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 hspreviewwidget.moc: $(srcdir)/hspreviewwidget.h
 	$(MOC) $(srcdir)/hspreviewwidget.h -o hspreviewwidget.moc
--- digikam-0.9.4.orig/digikam/imageplugins/coreplugin/ratiocrop/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/coreplugin/ratiocrop/Makefile.in
@@ -667,6 +667,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageselectionwidget.moc: $(srcdir)/imageselectionwidget.h
 	$(MOC) $(srcdir)/imageselectionwidget.h -o imageselectionwidget.moc
--- digikam-0.9.4.orig/digikam/imageplugins/filmgrain/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/filmgrain/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_filmgrain.moc: $(srcdir)/imageplugin_filmgrain.h
 	$(MOC) $(srcdir)/imageplugin_filmgrain.h -o imageplugin_filmgrain.moc
--- digikam-0.9.4.orig/digikam/imageplugins/charcoal/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/charcoal/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_charcoal.moc: $(srcdir)/imageplugin_charcoal.h
 	$(MOC) $(srcdir)/imageplugin_charcoal.h -o imageplugin_charcoal.moc
--- digikam-0.9.4.orig/digikam/imageplugins/adjustcurves/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/adjustcurves/Makefile.in
@@ -754,6 +754,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 adjustcurves.moc: $(srcdir)/adjustcurves.h
 	$(MOC) $(srcdir)/adjustcurves.h -o adjustcurves.moc
--- digikam-0.9.4.orig/digikam/imageplugins/distortionfx/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/distortionfx/Makefile.in
@@ -757,6 +757,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_distortionfx.moc: $(srcdir)/imageplugin_distortionfx.h
 	$(MOC) $(srcdir)/imageplugin_distortionfx.h -o imageplugin_distortionfx.moc
--- digikam-0.9.4.orig/digikam/imageplugins/antivignetting/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/antivignetting/Makefile.in
@@ -760,6 +760,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_antivignetting.moc: $(srcdir)/imageeffect_antivignetting.h
 	$(MOC) $(srcdir)/imageeffect_antivignetting.h -o imageeffect_antivignetting.moc
--- digikam-0.9.4.orig/digikam/imageplugins/lensdistortion/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/lensdistortion/Makefile.in
@@ -761,6 +761,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_lensdistortion.moc: $(srcdir)/imageplugin_lensdistortion.h
 	$(MOC) $(srcdir)/imageplugin_lensdistortion.h -o imageplugin_lensdistortion.moc
--- digikam-0.9.4.orig/digikam/imageplugins/superimpose/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/superimpose/Makefile.in
@@ -761,6 +761,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_superimpose.moc: $(srcdir)/imageeffect_superimpose.h
 	$(MOC) $(srcdir)/imageeffect_superimpose.h -o imageeffect_superimpose.moc
--- digikam-0.9.4.orig/digikam/imageplugins/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/Makefile.in
@@ -679,6 +679,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/imageplugins/raindrop/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/raindrop/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_raindrop.moc: $(srcdir)/imageplugin_raindrop.h
 	$(MOC) $(srcdir)/imageplugin_raindrop.h -o imageplugin_raindrop.moc
--- digikam-0.9.4.orig/digikam/imageplugins/inserttext/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/inserttext/Makefile.in
@@ -758,12 +758,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 3
-imageeffect_inserttext.moc: $(srcdir)/imageeffect_inserttext.h
-	$(MOC) $(srcdir)/imageeffect_inserttext.h -o imageeffect_inserttext.moc
-
-#>+ 2
-mocs: imageeffect_inserttext.moc
 
 #>+ 3
 fontchooserwidget.moc: $(srcdir)/fontchooserwidget.h
@@ -773,6 +767,13 @@
 mocs: fontchooserwidget.moc
 
 #>+ 3
+imageeffect_inserttext.moc: $(srcdir)/imageeffect_inserttext.h
+	$(MOC) $(srcdir)/imageeffect_inserttext.h -o imageeffect_inserttext.moc
+
+#>+ 2
+mocs: imageeffect_inserttext.moc
+
+#>+ 3
 imageplugin_inserttext.moc: $(srcdir)/imageplugin_inserttext.h
 	$(MOC) $(srcdir)/imageplugin_inserttext.h -o imageplugin_inserttext.moc
 
@@ -788,7 +789,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  imageeffect_inserttext.moc fontchooserwidget.moc imageplugin_inserttext.moc inserttextwidget.moc
+	-rm -f  fontchooserwidget.moc imageeffect_inserttext.moc imageplugin_inserttext.moc inserttextwidget.moc
 
 #>+ 2
 KDE_DIST=imageeffect_inserttext.h digikamimageplugin_inserttext.desktop inserttextwidget.h Makefile.in imageplugin_inserttext.h digikamimageplugin_inserttext_ui.rc fontchooserwidget.h Makefile.am 
@@ -835,7 +836,7 @@
 
 
 #>+ 11
-digikamimageplugin_inserttext_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imageplugin_inserttext.cpp $(srcdir)/imageeffect_inserttext.cpp $(srcdir)/inserttextwidget.cpp $(srcdir)/fontchooserwidget.cpp  fontchooserwidget.moc imageeffect_inserttext.moc imageplugin_inserttext.moc inserttextwidget.moc
+digikamimageplugin_inserttext_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imageplugin_inserttext.cpp $(srcdir)/imageeffect_inserttext.cpp $(srcdir)/inserttextwidget.cpp $(srcdir)/fontchooserwidget.cpp  imageeffect_inserttext.moc fontchooserwidget.moc imageplugin_inserttext.moc inserttextwidget.moc
 	@echo 'creating digikamimageplugin_inserttext_la.all_cpp.cpp ...'; \
 	rm -f digikamimageplugin_inserttext_la.all_cpp.files digikamimageplugin_inserttext_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> digikamimageplugin_inserttext_la.all_cpp.final; \
--- digikam-0.9.4.orig/digikam/imageplugins/oilpaint/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/oilpaint/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_oilpaint.moc: $(srcdir)/imageplugin_oilpaint.h
 	$(MOC) $(srcdir)/imageplugin_oilpaint.h -o imageplugin_oilpaint.moc
--- digikam-0.9.4.orig/digikam/imageplugins/border/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/border/Makefile.in
@@ -878,6 +878,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_border.moc: $(srcdir)/imageplugin_border.h
 	$(MOC) $(srcdir)/imageplugin_border.h -o imageplugin_border.moc
@@ -897,7 +898,7 @@
 	-rm -f  imageplugin_border.moc imageeffect_border.moc
 
 #>+ 2
-KDE_DIST=Makefile.in border.h digikamimageplugin_border_ui.rc digikamimageplugin_border.desktop imageeffect_border.h Makefile.am imageplugin_border.h 
+KDE_DIST=Makefile.in border.h digikamimageplugin_border_ui.rc digikamimageplugin_border.desktop imageeffect_border.h imageplugin_border.h Makefile.am 
 
 #>+ 2
 docs-am:
--- digikam-0.9.4.orig/digikam/imageplugins/border/patterns/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/border/patterns/Makefile.in
@@ -544,6 +544,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=rock-pattern.png dried-pattern.png Makefile.in granit-pattern.png stone-pattern.png pine-pattern.png craters-pattern.png ice-pattern.png pink-pattern.png leaf-pattern.png chalk-pattern.png wall-pattern.png rain-pattern.png paper-pattern.png marble-pattern.png wood-pattern.png Makefile.am parque-pattern.png 
 
--- digikam-0.9.4.orig/digikam/imageplugins/infrared/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/infrared/Makefile.in
@@ -755,6 +755,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_infrared.moc: $(srcdir)/imageeffect_infrared.h
 	$(MOC) $(srcdir)/imageeffect_infrared.h -o imageeffect_infrared.moc
--- digikam-0.9.4.orig/digikam/imageplugins/colorfx/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/colorfx/Makefile.in
@@ -754,6 +754,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageeffect_colorfx.moc: $(srcdir)/imageeffect_colorfx.h
 	$(MOC) $(srcdir)/imageeffect_colorfx.h -o imageeffect_colorfx.moc
--- digikam-0.9.4.orig/digikam/imageplugins/freerotation/Makefile.in
+++ digikam-0.9.4/digikam/imageplugins/freerotation/Makefile.in
@@ -757,6 +757,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageplugin_freerotation.moc: $(srcdir)/imageplugin_freerotation.h
 	$(MOC) $(srcdir)/imageplugin_freerotation.h -o imageplugin_freerotation.moc
--- digikam-0.9.4.orig/digikam/kioslave/Makefile.in
+++ digikam-0.9.4/digikam/kioslave/Makefile.in
@@ -839,6 +839,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in digikamdates.protocol digikamtags.protocol digikamsearch.protocol sqlitedb.h digikamtags.h digikamalbums.h digikamsearch.h digikamalbums.protocol digikamdates.h digikamthumbnail.protocol digikamthumbnail.h Makefile.am 
 
--- digikam-0.9.4.orig/digikam/digikam/Makefile.in
+++ digikam-0.9.4/digikam/digikam/Makefile.in
@@ -1225,6 +1225,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 5
 dcopiface.kidl: $(srcdir)/dcopiface.h $(DCOP_DEPENDENCIES)
 	$(DCOPIDL) $(srcdir)/dcopiface.h > dcopiface.kidl || ( rm -f dcopiface.kidl ; false )
@@ -1253,18 +1254,18 @@
 mocs: welcomepageview.moc
 
 #>+ 3
-mediaplayerview.moc: $(srcdir)/mediaplayerview.h
-	$(MOC) $(srcdir)/mediaplayerview.h -o mediaplayerview.moc
+albumthumbnailloader.moc: $(srcdir)/albumthumbnailloader.h
+	$(MOC) $(srcdir)/albumthumbnailloader.h -o albumthumbnailloader.moc
 
 #>+ 2
-mocs: mediaplayerview.moc
+mocs: albumthumbnailloader.moc
 
 #>+ 3
-albumthumbnailloader.moc: $(srcdir)/albumthumbnailloader.h
-	$(MOC) $(srcdir)/albumthumbnailloader.h -o albumthumbnailloader.moc
+mediaplayerview.moc: $(srcdir)/mediaplayerview.h
+	$(MOC) $(srcdir)/mediaplayerview.h -o mediaplayerview.moc
 
 #>+ 2
-mocs: albumthumbnailloader.moc
+mocs: mediaplayerview.moc
 
 #>+ 3
 ratingpopupmenu.moc: $(srcdir)/ratingpopupmenu.h
@@ -1295,18 +1296,18 @@
 mocs: folderview.moc
 
 #>+ 3
-pixmapmanager.moc: $(srcdir)/pixmapmanager.h
-	$(MOC) $(srcdir)/pixmapmanager.h -o pixmapmanager.moc
+digikamview.moc: $(srcdir)/digikamview.h
+	$(MOC) $(srcdir)/digikamview.h -o digikamview.moc
 
 #>+ 2
-mocs: pixmapmanager.moc
+mocs: digikamview.moc
 
 #>+ 3
-digikamview.moc: $(srcdir)/digikamview.h
-	$(MOC) $(srcdir)/digikamview.h -o digikamview.moc
+pixmapmanager.moc: $(srcdir)/pixmapmanager.h
+	$(MOC) $(srcdir)/pixmapmanager.h -o pixmapmanager.moc
 
 #>+ 2
-mocs: digikamview.moc
+mocs: pixmapmanager.moc
 
 #>+ 3
 albummanager.moc: $(srcdir)/albummanager.h
@@ -1316,18 +1317,18 @@
 mocs: albummanager.moc
 
 #>+ 3
-tagfilterview.moc: $(srcdir)/tagfilterview.h
-	$(MOC) $(srcdir)/tagfilterview.h -o tagfilterview.moc
+searchquickdialog.moc: $(srcdir)/searchquickdialog.h
+	$(MOC) $(srcdir)/searchquickdialog.h -o searchquickdialog.moc
 
 #>+ 2
-mocs: tagfilterview.moc
+mocs: searchquickdialog.moc
 
 #>+ 3
-searchquickdialog.moc: $(srcdir)/searchquickdialog.h
-	$(MOC) $(srcdir)/searchquickdialog.h -o searchquickdialog.moc
+tagfilterview.moc: $(srcdir)/tagfilterview.h
+	$(MOC) $(srcdir)/tagfilterview.h -o tagfilterview.moc
 
 #>+ 2
-mocs: searchquickdialog.moc
+mocs: tagfilterview.moc
 
 #>+ 3
 kdatetimeedit.moc: $(srcdir)/kdatetimeedit.h
@@ -1337,18 +1338,18 @@
 mocs: kdatetimeedit.moc
 
 #>+ 3
-monthwidget.moc: $(srcdir)/monthwidget.h
-	$(MOC) $(srcdir)/monthwidget.h -o monthwidget.moc
+dcopiface.moc: $(srcdir)/dcopiface.h
+	$(MOC) $(srcdir)/dcopiface.h -o dcopiface.moc
 
 #>+ 2
-mocs: monthwidget.moc
+mocs: dcopiface.moc
 
 #>+ 3
-dcopiface.moc: $(srcdir)/dcopiface.h
-	$(MOC) $(srcdir)/dcopiface.h -o dcopiface.moc
+monthwidget.moc: $(srcdir)/monthwidget.h
+	$(MOC) $(srcdir)/monthwidget.h -o monthwidget.moc
 
 #>+ 2
-mocs: dcopiface.moc
+mocs: monthwidget.moc
 
 #>+ 3
 digikamfirstrun.moc: $(srcdir)/digikamfirstrun.h
@@ -1365,18 +1366,18 @@
 mocs: ratingfilter.moc
 
 #>+ 3
-searchresultsview.moc: $(srcdir)/searchresultsview.h
-	$(MOC) $(srcdir)/searchresultsview.h -o searchresultsview.moc
+kdatepickerpopup.moc: $(srcdir)/kdatepickerpopup.h
+	$(MOC) $(srcdir)/kdatepickerpopup.h -o kdatepickerpopup.moc
 
 #>+ 2
-mocs: searchresultsview.moc
+mocs: kdatepickerpopup.moc
 
 #>+ 3
-kdatepickerpopup.moc: $(srcdir)/kdatepickerpopup.h
-	$(MOC) $(srcdir)/kdatepickerpopup.h -o kdatepickerpopup.moc
+searchresultsview.moc: $(srcdir)/searchresultsview.h
+	$(MOC) $(srcdir)/searchresultsview.h -o searchresultsview.moc
 
 #>+ 2
-mocs: kdatepickerpopup.moc
+mocs: searchresultsview.moc
 
 #>+ 3
 albumpropsedit.moc: $(srcdir)/albumpropsedit.h
@@ -1428,18 +1429,18 @@
 mocs: mimefilter.moc
 
 #>+ 3
-digikamapp.moc: $(srcdir)/digikamapp.h
-	$(MOC) $(srcdir)/digikamapp.h -o digikamapp.moc
+albumfolderview.moc: $(srcdir)/albumfolderview.h
+	$(MOC) $(srcdir)/albumfolderview.h -o albumfolderview.moc
 
 #>+ 2
-mocs: digikamapp.moc
+mocs: albumfolderview.moc
 
 #>+ 3
-albumfolderview.moc: $(srcdir)/albumfolderview.h
-	$(MOC) $(srcdir)/albumfolderview.h -o albumfolderview.moc
+digikamapp.moc: $(srcdir)/digikamapp.h
+	$(MOC) $(srcdir)/digikamapp.h -o digikamapp.moc
 
 #>+ 2
-mocs: albumfolderview.moc
+mocs: digikamapp.moc
 
 #>+ 3
 albumiconviewfilter.moc: $(srcdir)/albumiconviewfilter.h
@@ -1449,6 +1450,13 @@
 mocs: albumiconviewfilter.moc
 
 #>+ 3
+searchwidgets.moc: $(srcdir)/searchwidgets.h
+	$(MOC) $(srcdir)/searchwidgets.h -o searchwidgets.moc
+
+#>+ 2
+mocs: searchwidgets.moc
+
+#>+ 3
 searchadvanceddialog.moc: $(srcdir)/searchadvanceddialog.h
 	$(MOC) $(srcdir)/searchadvanceddialog.h -o searchadvanceddialog.moc
 
@@ -1463,13 +1471,6 @@
 mocs: albumhistory.moc
 
 #>+ 3
-searchwidgets.moc: $(srcdir)/searchwidgets.h
-	$(MOC) $(srcdir)/searchwidgets.h -o searchwidgets.moc
-
-#>+ 2
-mocs: searchwidgets.moc
-
-#>+ 3
 albumiconview.moc: $(srcdir)/albumiconview.h
 	$(MOC) $(srcdir)/albumiconview.h -o albumiconview.moc
 
@@ -1555,10 +1556,10 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  cameralist.moc albumlister.moc welcomepageview.moc mediaplayerview.moc albumthumbnailloader.moc ratingpopupmenu.moc timelineview.moc iconview.moc folderview.moc pixmapmanager.moc digikamview.moc albummanager.moc tagfilterview.moc searchquickdialog.moc kdatetimeedit.moc monthwidget.moc dcopiface.moc digikamfirstrun.moc ratingfilter.moc searchresultsview.moc kdatepickerpopup.moc albumpropsedit.moc imagepreviewview.moc kipiinterface.moc kdateedit.moc ratingwidget.moc syncjob.moc mimefilter.moc digikamapp.moc albumfolderview.moc albumiconviewfilter.moc searchadvanceddialog.moc albumhistory.moc searchwidgets.moc albumiconview.moc albumwidgetstack.moc searchfolderview.moc timelinefolderview.moc tagspopupmenu.moc imageattributeswatch.moc dio_p.moc firstrun.moc timelinewidget.moc datefolderview.moc tagfolderview.moc tageditdlg.moc
+	-rm -f  cameralist.moc albumlister.moc welcomepageview.moc albumthumbnailloader.moc mediaplayerview.moc ratingpopupmenu.moc timelineview.moc iconview.moc folderview.moc digikamview.moc pixmapmanager.moc albummanager.moc searchquickdialog.moc tagfilterview.moc kdatetimeedit.moc dcopiface.moc monthwidget.moc digikamfirstrun.moc ratingfilter.moc kdatepickerpopup.moc searchresultsview.moc albumpropsedit.moc imagepreviewview.moc kipiinterface.moc kdateedit.moc ratingwidget.moc syncjob.moc mimefilter.moc albumfolderview.moc digikamapp.moc albumiconviewfilter.moc searchwidgets.moc searchadvanceddialog.moc albumhistory.moc albumiconview.moc albumwidgetstack.moc searchfolderview.moc timelinefolderview.moc tagspopupmenu.moc imageattributeswatch.moc dio_p.moc firstrun.moc timelinewidget.moc datefolderview.moc tagfolderview.moc tageditdlg.moc
 
 #>+ 2
-KDE_DIST=monthwidget.h imageattributeswatch.h ratingwidget.h thumbnailsize.h timelinewidget.h pixmapmanager.h albumfiletip.h kdatepickerpopup.h digikamui.rc album.h tageditdlg.h imageinfo.h firstrun.h kdatetimeedit.h albumdb_sqlite2.h albuminfo.h albumhistory.h albumdb.h dragobjects.h Makefile.in cameralist.h dio.h albumitemhandler.h digikamapp.h albummanager.h searchresultsitem.h albumicongroupitem.h mediaplayerview.h ratingfilter.h imagepreviewview.h albumwidgetstack.h timelinefolderview.h albumthumbnailloader.h folderview.h albumiconviewfilter.h timelineview.h metadatahub.h digikam.desktop iconitem.h tagspopupmenu.h icongroupitem.h albumiconview.h searchwidgets.h mimefilter.h searchfolderview.h folderitem.h scanlib.h kipiinterface.h digikamappprivate.h searchadvanceddialog.h albumfolderview.h datefolderview.h searchresultsview.h albumlister.h searchquickdialog.h kdateedit.h tagfilterview.h syncjob.h dio_p.h albumiconitem.h constants.h iconview.h tagfolderview.h ratingpopupmenu.h albumpropsedit.h albumsettings.h upgradedb_sqlite2tosqlite3.h cameratype.h welcomepageview.h version.h digikamview.h Makefile.am digikamfirstrun.h 
+KDE_DIST=monthwidget.h imageattributeswatch.h ratingwidget.h thumbnailsize.h timelinewidget.h albumfiletip.h pixmapmanager.h kdatepickerpopup.h digikamui.rc album.h tageditdlg.h imageinfo.h firstrun.h kdatetimeedit.h albumdb_sqlite2.h albuminfo.h albumhistory.h albumdb.h dragobjects.h Makefile.in cameralist.h dio.h albumitemhandler.h digikamapp.h albummanager.h searchresultsitem.h albumicongroupitem.h mediaplayerview.h ratingfilter.h imagepreviewview.h albumwidgetstack.h timelinefolderview.h albumthumbnailloader.h folderview.h albumiconviewfilter.h timelineview.h metadatahub.h digikam.desktop iconitem.h tagspopupmenu.h icongroupitem.h albumiconview.h searchwidgets.h mimefilter.h searchfolderview.h folderitem.h scanlib.h kipiinterface.h digikamappprivate.h searchadvanceddialog.h albumfolderview.h datefolderview.h searchresultsview.h albumlister.h searchquickdialog.h kdateedit.h tagfilterview.h dio_p.h syncjob.h albumiconitem.h constants.h iconview.h tagfolderview.h ratingpopupmenu.h albumpropsedit.h albumsettings.h upgradedb_sqlite2tosqlite3.h cameratype.h welcomepageview.h version.h digikamview.h Makefile.am digikamfirstrun.h 
 
 #>+ 4
 clean-idl:
@@ -1607,7 +1608,7 @@
 
 
 #>+ 11
-libdigikam_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdateedit.cpp $(srcdir)/metadatahub.cpp $(srcdir)/digikamapp.cpp $(srcdir)/album.cpp $(srcdir)/albumdb.cpp $(srcdir)/albumdb_sqlite2.cpp $(srcdir)/albumicongroupitem.cpp $(srcdir)/albumiconitem.cpp $(srcdir)/albumiconview.cpp $(srcdir)/albumiconviewfilter.cpp $(srcdir)/albumitemhandler.cpp $(srcdir)/albumfiletip.cpp $(srcdir)/albumfolderview.cpp $(srcdir)/albumhistory.cpp $(srcdir)/albumlister.cpp $(srcdir)/albummanager.cpp $(srcdir)/albumpropsedit.cpp $(srcdir)/albumsettings.cpp $(srcdir)/albumthumbnailloader.cpp $(srcdir)/albumwidgetstack.cpp $(srcdir)/cameralist.cpp $(srcdir)/cameratype.cpp $(srcdir)/datefolderview.cpp $(srcdir)/dcopiface.cpp $(srcdir)/digikamfirstrun.cpp $(srcdir)/digikamview.cpp $(srcdir)/dio.cpp $(srcdir)/dragobjects.cpp $(srcdir)/firstrun.cpp $(srcdir)/folderitem.cpp $(srcdir)/folderview.cpp $(srcdir)/iconview.cpp $(srcdir)/icongroupitem.cpp $(srcdir)/iconitem.cpp $(srcdir)/imageattributeswatch.cpp $(srcdir)/imageinfo.cpp $(srcdir)/imagepreviewview.cpp $(srcdir)/kdatetimeedit.cpp $(srcdir)/kdatepickerpopup.cpp $(srcdir)/kipiinterface.cpp $(srcdir)/mediaplayerview.cpp $(srcdir)/mimefilter.cpp $(srcdir)/monthwidget.cpp $(srcdir)/pixmapmanager.cpp $(srcdir)/ratingfilter.cpp $(srcdir)/ratingpopupmenu.cpp $(srcdir)/ratingwidget.cpp $(srcdir)/scanlib.cpp $(srcdir)/searchadvanceddialog.cpp $(srcdir)/searchfolderview.cpp $(srcdir)/searchquickdialog.cpp $(srcdir)/searchresultsview.cpp $(srcdir)/searchresultsitem.cpp $(srcdir)/searchwidgets.cpp $(srcdir)/syncjob.cpp $(srcdir)/tageditdlg.cpp $(srcdir)/tagfilterview.cpp $(srcdir)/tagfolderview.cpp $(srcdir)/tagspopupmenu.cpp $(srcdir)/timelinefolderview.cpp $(srcdir)/timelineview.cpp $(srcdir)/timelinewidget.cpp $(srcdir)/upgradedb_sqlite2tosqlite3.cpp $(srcdir)/welcomepageview.cpp dcopiface_skel.cpp  cameralist.moc albumlister.moc welcomepageview.moc mediaplayerview.moc albumthumbnailloader.moc ratingpopupmenu.moc timelineview.moc iconview.moc folderview.moc digikamview.moc pixmapmanager.moc albummanager.moc tagfilterview.moc searchquickdialog.moc kdatetimeedit.moc monthwidget.moc dcopiface.moc digikamfirstrun.moc kdatepickerpopup.moc searchresultsview.moc ratingfilter.moc imagepreviewview.moc albumpropsedit.moc ratingwidget.moc kdateedit.moc kipiinterface.moc syncjob.moc mimefilter.moc digikamapp.moc albumfolderview.moc albumiconviewfilter.moc searchwidgets.moc albumhistory.moc searchadvanceddialog.moc albumiconview.moc albumwidgetstack.moc searchfolderview.moc timelinefolderview.moc tagspopupmenu.moc imageattributeswatch.moc dio_p.moc firstrun.moc datefolderview.moc timelinewidget.moc tageditdlg.moc tagfolderview.moc
+libdigikam_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdateedit.cpp $(srcdir)/metadatahub.cpp $(srcdir)/digikamapp.cpp $(srcdir)/album.cpp $(srcdir)/albumdb.cpp $(srcdir)/albumdb_sqlite2.cpp $(srcdir)/albumicongroupitem.cpp $(srcdir)/albumiconitem.cpp $(srcdir)/albumiconview.cpp $(srcdir)/albumiconviewfilter.cpp $(srcdir)/albumitemhandler.cpp $(srcdir)/albumfiletip.cpp $(srcdir)/albumfolderview.cpp $(srcdir)/albumhistory.cpp $(srcdir)/albumlister.cpp $(srcdir)/albummanager.cpp $(srcdir)/albumpropsedit.cpp $(srcdir)/albumsettings.cpp $(srcdir)/albumthumbnailloader.cpp $(srcdir)/albumwidgetstack.cpp $(srcdir)/cameralist.cpp $(srcdir)/cameratype.cpp $(srcdir)/datefolderview.cpp $(srcdir)/dcopiface.cpp $(srcdir)/digikamfirstrun.cpp $(srcdir)/digikamview.cpp $(srcdir)/dio.cpp $(srcdir)/dragobjects.cpp $(srcdir)/firstrun.cpp $(srcdir)/folderitem.cpp $(srcdir)/folderview.cpp $(srcdir)/iconview.cpp $(srcdir)/icongroupitem.cpp $(srcdir)/iconitem.cpp $(srcdir)/imageattributeswatch.cpp $(srcdir)/imageinfo.cpp $(srcdir)/imagepreviewview.cpp $(srcdir)/kdatetimeedit.cpp $(srcdir)/kdatepickerpopup.cpp $(srcdir)/kipiinterface.cpp $(srcdir)/mediaplayerview.cpp $(srcdir)/mimefilter.cpp $(srcdir)/monthwidget.cpp $(srcdir)/pixmapmanager.cpp $(srcdir)/ratingfilter.cpp $(srcdir)/ratingpopupmenu.cpp $(srcdir)/ratingwidget.cpp $(srcdir)/scanlib.cpp $(srcdir)/searchadvanceddialog.cpp $(srcdir)/searchfolderview.cpp $(srcdir)/searchquickdialog.cpp $(srcdir)/searchresultsview.cpp $(srcdir)/searchresultsitem.cpp $(srcdir)/searchwidgets.cpp $(srcdir)/syncjob.cpp $(srcdir)/tageditdlg.cpp $(srcdir)/tagfilterview.cpp $(srcdir)/tagfolderview.cpp $(srcdir)/tagspopupmenu.cpp $(srcdir)/timelinefolderview.cpp $(srcdir)/timelineview.cpp $(srcdir)/timelinewidget.cpp $(srcdir)/upgradedb_sqlite2tosqlite3.cpp $(srcdir)/welcomepageview.cpp dcopiface_skel.cpp  cameralist.moc albumlister.moc welcomepageview.moc albumthumbnailloader.moc mediaplayerview.moc ratingpopupmenu.moc timelineview.moc iconview.moc folderview.moc pixmapmanager.moc digikamview.moc albummanager.moc searchquickdialog.moc tagfilterview.moc kdatetimeedit.moc dcopiface.moc monthwidget.moc digikamfirstrun.moc searchresultsview.moc kdatepickerpopup.moc ratingfilter.moc imagepreviewview.moc albumpropsedit.moc ratingwidget.moc kdateedit.moc kipiinterface.moc syncjob.moc mimefilter.moc albumfolderview.moc digikamapp.moc albumiconviewfilter.moc albumhistory.moc searchadvanceddialog.moc searchwidgets.moc albumiconview.moc albumwidgetstack.moc searchfolderview.moc timelinefolderview.moc tagspopupmenu.moc imageattributeswatch.moc dio_p.moc firstrun.moc datefolderview.moc timelinewidget.moc tageditdlg.moc tagfolderview.moc
 	@echo 'creating libdigikam_la.all_cpp.cpp ...'; \
 	rm -f libdigikam_la.all_cpp.files libdigikam_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libdigikam_la.all_cpp.final; \
@@ -1719,8 +1720,8 @@
 kdatetimeedit.lo: kdatetimeedit.moc 
 digikamview.o: digikamview.moc 
 albumwidgetstack.o: albumwidgetstack.moc 
-monthwidget.o: monthwidget.moc 
 ratingpopupmenu.o: ratingpopupmenu.moc 
+monthwidget.o: monthwidget.moc 
 searchadvanceddialog.lo: searchadvanceddialog.moc 
 searchwidgets.o: searchwidgets.moc 
 mediaplayerview.lo: mediaplayerview.moc 
--- digikam-0.9.4.orig/digikam/Makefile.in
+++ digikam-0.9.4/digikam/Makefile.in
@@ -815,8 +815,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
-KDE_DIST=Mainpage.dox COPYING-DOCS DBSCHEMA.ODS configure.in.bot Makefile.in NEWS.0.9.1 NEWS.0.9.2 NEWS.0.9.3 tips NEWS.0.9.0 configure.in.in PACKAGING Makefile.am DESIGN 
+KDE_DIST=Mainpage.dox COPYING-DOCS DBSCHEMA.ODS configure.in.bot Makefile.in NEWS.0.9.1 NEWS.0.9.2 tips NEWS.0.9.3 NEWS.0.9.0 configure.in.in PACKAGING Makefile.am DESIGN 
 
 #>+ 2
 docs-am:
--- digikam-0.9.4.orig/digikam/libs/whitebalance/Makefile.in
+++ digikam-0.9.4/digikam/libs/whitebalance/Makefile.in
@@ -679,6 +679,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in blackbody.h Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/themeengine/Makefile.in
+++ digikam-0.9.4/digikam/libs/themeengine/Makefile.in
@@ -650,6 +650,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 themeengine.moc: $(srcdir)/themeengine.h
 	$(MOC) $(srcdir)/themeengine.h -o themeengine.moc
--- digikam-0.9.4.orig/digikam/libs/levels/Makefile.in
+++ digikam-0.9.4/digikam/libs/levels/Makefile.in
@@ -680,6 +680,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/sqlite2/Makefile.in
+++ digikam-0.9.4/digikam/libs/sqlite2/Makefile.in
@@ -951,6 +951,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=sqlite.h os.h Makefile.in parse.h hash.h vdbeInt.h sqliteInt.h pager.h btree.h vdbe.h opcodes.h Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/jpegutils/Makefile.in
+++ digikam-0.9.4/digikam/libs/jpegutils/Makefile.in
@@ -655,6 +655,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in libjpeg62.README jpegutils.h transupp.h jinclude.h jpegint.h Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/imageproperties/Makefile.in
+++ digikam-0.9.4/digikam/libs/imageproperties/Makefile.in
@@ -762,6 +762,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 navigatebartab.moc: $(srcdir)/navigatebartab.h
 	$(MOC) $(srcdir)/navigatebartab.h -o navigatebartab.moc
@@ -784,18 +785,18 @@
 mocs: imagepropertiescolorstab.moc
 
 #>+ 3
-imagepropertiesmetadatatab.moc: $(srcdir)/imagepropertiesmetadatatab.h
-	$(MOC) $(srcdir)/imagepropertiesmetadatatab.h -o imagepropertiesmetadatatab.moc
+talbumlistview.moc: $(srcdir)/talbumlistview.h
+	$(MOC) $(srcdir)/talbumlistview.h -o talbumlistview.moc
 
 #>+ 2
-mocs: imagepropertiesmetadatatab.moc
+mocs: talbumlistview.moc
 
 #>+ 3
-talbumlistview.moc: $(srcdir)/talbumlistview.h
-	$(MOC) $(srcdir)/talbumlistview.h -o talbumlistview.moc
+imagepropertiesmetadatatab.moc: $(srcdir)/imagepropertiesmetadatatab.h
+	$(MOC) $(srcdir)/imagepropertiesmetadatatab.h -o imagepropertiesmetadatatab.moc
 
 #>+ 2
-mocs: talbumlistview.moc
+mocs: imagepropertiesmetadatatab.moc
 
 #>+ 3
 imagepropertiessidebardb.moc: $(srcdir)/imagepropertiessidebardb.h
@@ -841,7 +842,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  navigatebartab.moc navigatebarwidget.moc imagepropertiescolorstab.moc imagepropertiesmetadatatab.moc talbumlistview.moc imagepropertiessidebardb.moc cameraitempropertiestab.moc imagedescedittab.moc imagepropertiessidebarcamgui.moc imagepropertiestab.moc imagepropertiessidebar.moc
+	-rm -f  navigatebartab.moc navigatebarwidget.moc imagepropertiescolorstab.moc talbumlistview.moc imagepropertiesmetadatatab.moc imagepropertiessidebardb.moc cameraitempropertiestab.moc imagedescedittab.moc imagepropertiessidebarcamgui.moc imagepropertiestab.moc imagepropertiessidebar.moc
 
 #>+ 2
 KDE_DIST=imagepropertiesmetadatatab.h navigatebartab.h Makefile.in imagepropertiessidebarcamgui.h cameraitempropertiestab.h talbumlistview.h imagedescedittab.h imagepropertiessidebardb.h navigatebarwidget.h imagepropertiessidebar.h imagepropertiestab.h imagepropertiescolorstab.h Makefile.am 
@@ -900,7 +901,7 @@
 	rm -f libimagepropertiescamgui_la.all_cpp.final libimagepropertiescamgui_la.all_cpp.files
 
 #>+ 11
-libimagepropertiesdigikam_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imagedescedittab.cpp $(srcdir)/imagepropertiessidebar.cpp $(srcdir)/imagepropertiessidebardb.cpp $(srcdir)/talbumlistview.cpp $(srcdir)/imagepropertiesmetadatatab.cpp $(srcdir)/imagepropertiescolorstab.cpp $(srcdir)/navigatebarwidget.cpp $(srcdir)/imagepropertiestab.cpp $(srcdir)/navigatebartab.cpp  navigatebarwidget.moc navigatebartab.moc talbumlistview.moc imagepropertiesmetadatatab.moc imagepropertiescolorstab.moc imagepropertiessidebardb.moc imagedescedittab.moc imagepropertiessidebar.moc imagepropertiestab.moc
+libimagepropertiesdigikam_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imagedescedittab.cpp $(srcdir)/imagepropertiessidebar.cpp $(srcdir)/imagepropertiessidebardb.cpp $(srcdir)/talbumlistview.cpp $(srcdir)/imagepropertiesmetadatatab.cpp $(srcdir)/imagepropertiescolorstab.cpp $(srcdir)/navigatebarwidget.cpp $(srcdir)/imagepropertiestab.cpp $(srcdir)/navigatebartab.cpp  navigatebarwidget.moc navigatebartab.moc imagepropertiesmetadatatab.moc talbumlistview.moc imagepropertiescolorstab.moc imagepropertiessidebardb.moc imagedescedittab.moc imagepropertiessidebar.moc imagepropertiestab.moc
 	@echo 'creating libimagepropertiesdigikam_la.all_cpp.cpp ...'; \
 	rm -f libimagepropertiesdigikam_la.all_cpp.files libimagepropertiesdigikam_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libimagepropertiesdigikam_la.all_cpp.final; \
--- digikam-0.9.4.orig/digikam/libs/curves/Makefile.in
+++ digikam-0.9.4/digikam/libs/curves/Makefile.in
@@ -679,6 +679,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/threadimageio/Makefile.in
+++ digikam-0.9.4/digikam/libs/threadimageio/Makefile.in
@@ -674,6 +674,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 previewloadthread.moc: $(srcdir)/previewloadthread.h
 	$(MOC) $(srcdir)/previewloadthread.h -o previewloadthread.moc
--- digikam-0.9.4.orig/digikam/libs/sqlite3/Makefile.in
+++ digikam-0.9.4/digikam/libs/sqlite3/Makefile.in
@@ -633,6 +633,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=sqlite3.h Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/histogram/Makefile.in
+++ digikam-0.9.4/digikam/libs/histogram/Makefile.in
@@ -679,6 +679,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/lprof/Makefile.in
+++ digikam-0.9.4/digikam/libs/lprof/Makefile.in
@@ -803,6 +803,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/dialogs/Makefile.in
+++ digikam-0.9.4/digikam/libs/dialogs/Makefile.in
@@ -736,12 +736,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 3
-dprogressdlg.moc: $(srcdir)/dprogressdlg.h
-	$(MOC) $(srcdir)/dprogressdlg.h -o dprogressdlg.moc
-
-#>+ 2
-mocs: dprogressdlg.moc
 
 #>+ 3
 rawcameradlg.moc: $(srcdir)/rawcameradlg.h
@@ -751,18 +745,18 @@
 mocs: rawcameradlg.moc
 
 #>+ 3
-imagedialog.moc: $(srcdir)/imagedialog.h
-	$(MOC) $(srcdir)/imagedialog.h -o imagedialog.moc
+dprogressdlg.moc: $(srcdir)/dprogressdlg.h
+	$(MOC) $(srcdir)/dprogressdlg.h -o dprogressdlg.moc
 
 #>+ 2
-mocs: imagedialog.moc
+mocs: dprogressdlg.moc
 
 #>+ 3
-imagedlgbase.moc: $(srcdir)/imagedlgbase.h
-	$(MOC) $(srcdir)/imagedlgbase.h -o imagedlgbase.moc
+imagedialog.moc: $(srcdir)/imagedialog.h
+	$(MOC) $(srcdir)/imagedialog.h -o imagedialog.moc
 
 #>+ 2
-mocs: imagedlgbase.moc
+mocs: imagedialog.moc
 
 #>+ 3
 ctrlpaneldlg.moc: $(srcdir)/ctrlpaneldlg.h
@@ -772,6 +766,13 @@
 mocs: ctrlpaneldlg.moc
 
 #>+ 3
+imagedlgbase.moc: $(srcdir)/imagedlgbase.h
+	$(MOC) $(srcdir)/imagedlgbase.h -o imagedlgbase.moc
+
+#>+ 2
+mocs: imagedlgbase.moc
+
+#>+ 3
 deletedialog.moc: $(srcdir)/deletedialog.h
 	$(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
 
@@ -787,7 +788,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  dprogressdlg.moc rawcameradlg.moc imagedialog.moc imagedlgbase.moc ctrlpaneldlg.moc deletedialog.moc imageguidedlg.moc
+	-rm -f  rawcameradlg.moc dprogressdlg.moc imagedialog.moc ctrlpaneldlg.moc imagedlgbase.moc deletedialog.moc imageguidedlg.moc
 
 #>+ 2
 KDE_DIST=Makefile.in deletedialog.h deletedialogbase.ui Makefile.am 
@@ -839,7 +840,7 @@
 
 
 #>+ 11
-libdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imagedialog.cpp $(srcdir)/rawcameradlg.cpp $(srcdir)/ctrlpaneldlg.cpp $(srcdir)/imagedlgbase.cpp $(srcdir)/imageguidedlg.cpp $(srcdir)/iccprofileinfodlg.cpp $(srcdir)/deletedialog.cpp $(srcdir)/dprogressdlg.cpp deletedialogbase.cpp  deletedialogbase.moc rawcameradlg.moc dprogressdlg.moc imagedialog.moc ctrlpaneldlg.moc imagedlgbase.moc deletedialog.moc imageguidedlg.moc
+libdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imagedialog.cpp $(srcdir)/rawcameradlg.cpp $(srcdir)/ctrlpaneldlg.cpp $(srcdir)/imagedlgbase.cpp $(srcdir)/imageguidedlg.cpp $(srcdir)/iccprofileinfodlg.cpp $(srcdir)/deletedialog.cpp $(srcdir)/dprogressdlg.cpp deletedialogbase.cpp  deletedialogbase.moc dprogressdlg.moc rawcameradlg.moc imagedialog.moc imagedlgbase.moc ctrlpaneldlg.moc deletedialog.moc imageguidedlg.moc
 	@echo 'creating libdialog_la.all_cpp.cpp ...'; \
 	rm -f libdialog_la.all_cpp.files libdialog_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libdialog_la.all_cpp.final; \
@@ -907,8 +908,8 @@
 imagedlgbase.lo: imagedlgbase.moc 
 $(srcdir)/imagedialog.cpp: deletedialogbase.h 
 imagedialog.lo: imagedialog.moc 
-rawcameradlg.lo: rawcameradlg.moc 
 ctrlpaneldlg.lo: ctrlpaneldlg.moc 
+rawcameradlg.lo: rawcameradlg.moc 
 $(srcdir)/imagedlgbase.cpp: deletedialogbase.h 
 imagedialog.o: imagedialog.moc 
 
--- digikam-0.9.4.orig/digikam/libs/Makefile.in
+++ digikam-0.9.4/digikam/libs/Makefile.in
@@ -681,6 +681,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/thumbbar/Makefile.in
+++ digikam-0.9.4/digikam/libs/thumbbar/Makefile.in
@@ -685,6 +685,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 thumbnailjob.moc: $(srcdir)/thumbnailjob.h
 	$(MOC) $(srcdir)/thumbnailjob.h -o thumbnailjob.moc
--- digikam-0.9.4.orig/digikam/libs/dimg/filters/Makefile.in
+++ digikam-0.9.4/digikam/libs/dimg/filters/Makefile.in
@@ -700,6 +700,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/dimg/Makefile.in
+++ digikam-0.9.4/digikam/libs/dimg/Makefile.in
@@ -832,6 +832,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=exposurecontainer.h Makefile.in dimgprivate.h Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/dimg/loaders/Makefile.in
+++ digikam-0.9.4/digikam/libs/dimg/loaders/Makefile.in
@@ -703,12 +703,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 3
-pngsettings.moc: $(srcdir)/pngsettings.h
-	$(MOC) $(srcdir)/pngsettings.h -o pngsettings.moc
-
-#>+ 2
-mocs: pngsettings.moc
 
 #>+ 3
 rawloader.moc: $(srcdir)/rawloader.h
@@ -718,6 +712,13 @@
 mocs: rawloader.moc
 
 #>+ 3
+pngsettings.moc: $(srcdir)/pngsettings.h
+	$(MOC) $(srcdir)/pngsettings.h -o pngsettings.moc
+
+#>+ 2
+mocs: pngsettings.moc
+
+#>+ 3
 jpegsettings.moc: $(srcdir)/jpegsettings.h
 	$(MOC) $(srcdir)/jpegsettings.h -o jpegsettings.moc
 
@@ -740,7 +741,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  pngsettings.moc rawloader.moc jpegsettings.moc jp2ksettings.moc tiffsettings.moc
+	-rm -f  rawloader.moc pngsettings.moc jpegsettings.moc jp2ksettings.moc tiffsettings.moc
 
 #>+ 2
 KDE_DIST=rawloader.h qimageloader.h iccjpeg.h Makefile.in dimgloaderobserver.h tiffloader.h jpegloader.h tiffsettings.h jp2ksettings.h ppmloader.h pngloader.h jpegsettings.h pngsettings.h dimgloader.h jp2kloader.h Makefile.am 
@@ -787,7 +788,7 @@
 
 
 #>+ 11
-libdimgloaders_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dimgloader.cpp $(srcdir)/pngloader.cpp $(srcdir)/jpegloader.cpp $(srcdir)/tiffloader.cpp $(srcdir)/rawloader.cpp $(srcdir)/ppmloader.cpp $(srcdir)/qimageloader.cpp $(srcdir)/jp2kloader.cpp $(srcdir)/jpegsettings.cpp $(srcdir)/pngsettings.cpp $(srcdir)/tiffsettings.cpp $(srcdir)/jp2ksettings.cpp  rawloader.moc pngsettings.moc jpegsettings.moc jp2ksettings.moc tiffsettings.moc
+libdimgloaders_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dimgloader.cpp $(srcdir)/pngloader.cpp $(srcdir)/jpegloader.cpp $(srcdir)/tiffloader.cpp $(srcdir)/rawloader.cpp $(srcdir)/ppmloader.cpp $(srcdir)/qimageloader.cpp $(srcdir)/jp2kloader.cpp $(srcdir)/jpegsettings.cpp $(srcdir)/pngsettings.cpp $(srcdir)/tiffsettings.cpp $(srcdir)/jp2ksettings.cpp  pngsettings.moc rawloader.moc jpegsettings.moc jp2ksettings.moc tiffsettings.moc
 	@echo 'creating libdimgloaders_la.all_cpp.cpp ...'; \
 	rm -f libdimgloaders_la.all_cpp.files libdimgloaders_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libdimgloaders_la.all_cpp.final; \
--- digikam-0.9.4.orig/digikam/libs/widgets/iccprofiles/Makefile.in
+++ digikam-0.9.4/digikam/libs/widgets/iccprofiles/Makefile.in
@@ -696,6 +696,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 iccpreviewwidget.moc: $(srcdir)/iccpreviewwidget.h
 	$(MOC) $(srcdir)/iccpreviewwidget.h -o iccpreviewwidget.moc
--- digikam-0.9.4.orig/digikam/libs/widgets/imageplugins/Makefile.in
+++ digikam-0.9.4/digikam/libs/widgets/imageplugins/Makefile.in
@@ -703,6 +703,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 imageguidewidget.moc: $(srcdir)/imageguidewidget.h
 	$(MOC) $(srcdir)/imageguidewidget.h -o imageguidewidget.moc
@@ -718,11 +719,11 @@
 mocs: imageregionwidget.moc
 
 #>+ 3
-imagewidget.moc: $(srcdir)/imagewidget.h
-	$(MOC) $(srcdir)/imagewidget.h -o imagewidget.moc
+imagepannelwidget.moc: $(srcdir)/imagepannelwidget.h
+	$(MOC) $(srcdir)/imagepannelwidget.h -o imagepannelwidget.moc
 
 #>+ 2
-mocs: imagewidget.moc
+mocs: imagepannelwidget.moc
 
 #>+ 3
 imagepaniconwidget.moc: $(srcdir)/imagepaniconwidget.h
@@ -732,15 +733,15 @@
 mocs: imagepaniconwidget.moc
 
 #>+ 3
-imagepannelwidget.moc: $(srcdir)/imagepannelwidget.h
-	$(MOC) $(srcdir)/imagepannelwidget.h -o imagepannelwidget.moc
+imagewidget.moc: $(srcdir)/imagewidget.h
+	$(MOC) $(srcdir)/imagewidget.h -o imagewidget.moc
 
 #>+ 2
-mocs: imagepannelwidget.moc
+mocs: imagewidget.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  imageguidewidget.moc imageregionwidget.moc imagewidget.moc imagepaniconwidget.moc imagepannelwidget.moc
+	-rm -f  imageguidewidget.moc imageregionwidget.moc imagepannelwidget.moc imagepaniconwidget.moc imagewidget.moc
 
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
@@ -787,7 +788,7 @@
 
 
 #>+ 11
-libimagepluginswidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imageregionwidget.cpp $(srcdir)/imagepaniconwidget.cpp $(srcdir)/imageguidewidget.cpp $(srcdir)/imagepannelwidget.cpp $(srcdir)/imagewidget.cpp $(srcdir)/listboxpreviewitem.cpp  imageguidewidget.moc imageregionwidget.moc imagepannelwidget.moc imagepaniconwidget.moc imagewidget.moc
+libimagepluginswidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/imageregionwidget.cpp $(srcdir)/imagepaniconwidget.cpp $(srcdir)/imageguidewidget.cpp $(srcdir)/imagepannelwidget.cpp $(srcdir)/imagewidget.cpp $(srcdir)/listboxpreviewitem.cpp  imageguidewidget.moc imageregionwidget.moc imagewidget.moc imagepaniconwidget.moc imagepannelwidget.moc
 	@echo 'creating libimagepluginswidgets_la.all_cpp.cpp ...'; \
 	rm -f libimagepluginswidgets_la.all_cpp.files libimagepluginswidgets_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libimagepluginswidgets_la.all_cpp.final; \
@@ -826,8 +827,8 @@
 nmcheck: 
 imagewidget.o: imagewidget.moc 
 imageregionwidget.lo: imageregionwidget.moc 
-imagepaniconwidget.o: imagepaniconwidget.moc 
 imagewidget.lo: imagewidget.moc 
+imagepaniconwidget.o: imagepaniconwidget.moc 
 imageregionwidget.o: imageregionwidget.moc 
 nmcheck-am: nmcheck
 imagepannelwidget.o: imagepannelwidget.moc 
--- digikam-0.9.4.orig/digikam/libs/widgets/metadata/Makefile.in
+++ digikam-0.9.4/digikam/libs/widgets/metadata/Makefile.in
@@ -668,6 +668,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 gpswidget.moc: $(srcdir)/gpswidget.h
 	$(MOC) $(srcdir)/gpswidget.h -o gpswidget.moc
@@ -683,18 +684,18 @@
 mocs: makernotewidget.moc
 
 #>+ 3
-worldmapwidget.moc: $(srcdir)/worldmapwidget.h
-	$(MOC) $(srcdir)/worldmapwidget.h -o worldmapwidget.moc
+metadatalistview.moc: $(srcdir)/metadatalistview.h
+	$(MOC) $(srcdir)/metadatalistview.h -o metadatalistview.moc
 
 #>+ 2
-mocs: worldmapwidget.moc
+mocs: metadatalistview.moc
 
 #>+ 3
-metadatalistview.moc: $(srcdir)/metadatalistview.h
-	$(MOC) $(srcdir)/metadatalistview.h -o metadatalistview.moc
+worldmapwidget.moc: $(srcdir)/worldmapwidget.h
+	$(MOC) $(srcdir)/worldmapwidget.h -o worldmapwidget.moc
 
 #>+ 2
-mocs: metadatalistview.moc
+mocs: worldmapwidget.moc
 
 #>+ 3
 metadatawidget.moc: $(srcdir)/metadatawidget.h
@@ -719,7 +720,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  gpswidget.moc makernotewidget.moc worldmapwidget.moc metadatalistview.moc metadatawidget.moc iptcwidget.moc exifwidget.moc
+	-rm -f  gpswidget.moc makernotewidget.moc metadatalistview.moc worldmapwidget.moc metadatawidget.moc iptcwidget.moc exifwidget.moc
 
 #>+ 2
 KDE_DIST=metadatawidget.h Makefile.in metadatalistviewitem.h exifwidget.h gpswidget.h makernotewidget.h metadatalistview.h mdkeylistviewitem.h iptcwidget.h worldmapwidget.h Makefile.am 
@@ -766,7 +767,7 @@
 
 
 #>+ 11
-libmetadatawidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metadatalistview.cpp $(srcdir)/metadatalistviewitem.cpp $(srcdir)/metadatawidget.cpp $(srcdir)/iptcwidget.cpp $(srcdir)/exifwidget.cpp $(srcdir)/mdkeylistviewitem.cpp $(srcdir)/makernotewidget.cpp $(srcdir)/gpswidget.cpp $(srcdir)/worldmapwidget.cpp  gpswidget.moc makernotewidget.moc metadatalistview.moc worldmapwidget.moc metadatawidget.moc iptcwidget.moc exifwidget.moc
+libmetadatawidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metadatalistview.cpp $(srcdir)/metadatalistviewitem.cpp $(srcdir)/metadatawidget.cpp $(srcdir)/iptcwidget.cpp $(srcdir)/exifwidget.cpp $(srcdir)/mdkeylistviewitem.cpp $(srcdir)/makernotewidget.cpp $(srcdir)/gpswidget.cpp $(srcdir)/worldmapwidget.cpp  gpswidget.moc makernotewidget.moc worldmapwidget.moc metadatalistview.moc metadatawidget.moc iptcwidget.moc exifwidget.moc
 	@echo 'creating libmetadatawidgets_la.all_cpp.cpp ...'; \
 	rm -f libmetadatawidgets_la.all_cpp.files libmetadatawidgets_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libmetadatawidgets_la.all_cpp.final; \
@@ -814,7 +815,7 @@
 exifwidget.lo: exifwidget.moc 
 nmcheck-am: nmcheck
 makernotewidget.o: makernotewidget.moc 
-metadatalistview.lo: metadatalistview.moc 
 metadatawidget.lo: metadatawidget.moc 
+metadatalistview.lo: metadatalistview.moc 
 worldmapwidget.o: worldmapwidget.moc 
 makernotewidget.lo: makernotewidget.moc 
--- digikam-0.9.4.orig/digikam/libs/widgets/Makefile.in
+++ digikam-0.9.4/digikam/libs/widgets/Makefile.in
@@ -727,6 +727,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/libs/widgets/common/Makefile.in
+++ digikam-0.9.4/digikam/libs/widgets/common/Makefile.in
@@ -719,12 +719,6 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 3
-statusprogressbar.moc: $(srcdir)/statusprogressbar.h
-	$(MOC) $(srcdir)/statusprogressbar.h -o statusprogressbar.moc
-
-#>+ 2
-mocs: statusprogressbar.moc
 
 #>+ 3
 statusnavigatebar.moc: $(srcdir)/statusnavigatebar.h
@@ -734,6 +728,13 @@
 mocs: statusnavigatebar.moc
 
 #>+ 3
+statusprogressbar.moc: $(srcdir)/statusprogressbar.h
+	$(MOC) $(srcdir)/statusprogressbar.h -o statusprogressbar.moc
+
+#>+ 2
+mocs: statusprogressbar.moc
+
+#>+ 3
 statuszoombar.moc: $(srcdir)/statuszoombar.h
 	$(MOC) $(srcdir)/statuszoombar.h -o statuszoombar.moc
 
@@ -755,18 +756,18 @@
 mocs: filesaveoptionsbox.moc
 
 #>+ 3
-colorgradientwidget.moc: $(srcdir)/colorgradientwidget.h
-	$(MOC) $(srcdir)/colorgradientwidget.h -o colorgradientwidget.moc
+searchtextbar.moc: $(srcdir)/searchtextbar.h
+	$(MOC) $(srcdir)/searchtextbar.h -o searchtextbar.moc
 
 #>+ 2
-mocs: colorgradientwidget.moc
+mocs: searchtextbar.moc
 
 #>+ 3
-searchtextbar.moc: $(srcdir)/searchtextbar.h
-	$(MOC) $(srcdir)/searchtextbar.h -o searchtextbar.moc
+colorgradientwidget.moc: $(srcdir)/colorgradientwidget.h
+	$(MOC) $(srcdir)/colorgradientwidget.h -o colorgradientwidget.moc
 
 #>+ 2
-mocs: searchtextbar.moc
+mocs: colorgradientwidget.moc
 
 #>+ 3
 histogramwidget.moc: $(srcdir)/histogramwidget.h
@@ -783,18 +784,18 @@
 mocs: statusled.moc
 
 #>+ 3
-dlogoaction.moc.cpp: $(srcdir)/dlogoaction.h
-	$(MOC) $(srcdir)/dlogoaction.h -o dlogoaction.moc.cpp
+sidebar.moc: $(srcdir)/sidebar.h
+	$(MOC) $(srcdir)/sidebar.h -o sidebar.moc
 
 #>+ 2
-mocs: dlogoaction.moc.cpp
+mocs: sidebar.moc
 
 #>+ 3
-sidebar.moc: $(srcdir)/sidebar.h
-	$(MOC) $(srcdir)/sidebar.h -o sidebar.moc
+dlogoaction.moc.cpp: $(srcdir)/dlogoaction.h
+	$(MOC) $(srcdir)/dlogoaction.h -o dlogoaction.moc.cpp
 
 #>+ 2
-mocs: sidebar.moc
+mocs: dlogoaction.moc.cpp
 
 #>+ 3
 splashscreen.moc: $(srcdir)/splashscreen.h
@@ -826,7 +827,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  statusprogressbar.moc statusnavigatebar.moc statuszoombar.moc paniconwidget.moc filesaveoptionsbox.moc colorgradientwidget.moc searchtextbar.moc histogramwidget.moc statusled.moc dlogoaction.moc.cpp sidebar.moc splashscreen.moc curveswidget.moc squeezedcombobox.moc previewwidget.moc
+	-rm -f  statusnavigatebar.moc statusprogressbar.moc statuszoombar.moc paniconwidget.moc filesaveoptionsbox.moc searchtextbar.moc colorgradientwidget.moc histogramwidget.moc statusled.moc sidebar.moc dlogoaction.moc.cpp splashscreen.moc curveswidget.moc squeezedcombobox.moc previewwidget.moc
 
 #>+ 2
 KDE_DIST=filesaveoptionsbox.h Makefile.in splashscreen.h Makefile.am 
@@ -873,7 +874,7 @@
 
 
 #>+ 11
-libcommonwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/histogramwidget.cpp $(srcdir)/colorgradientwidget.cpp $(srcdir)/curveswidget.cpp $(srcdir)/dlogoaction.cpp $(srcdir)/sidebar.cpp $(srcdir)/squeezedcombobox.cpp $(srcdir)/filesaveoptionsbox.cpp $(srcdir)/dpopupmenu.cpp $(srcdir)/statuszoombar.cpp $(srcdir)/statusnavigatebar.cpp $(srcdir)/statusprogressbar.cpp $(srcdir)/searchtextbar.cpp $(srcdir)/dcursortracker.cpp $(srcdir)/paniconwidget.cpp $(srcdir)/previewwidget.cpp $(srcdir)/splashscreen.cpp $(srcdir)/statusled.cpp dlogoaction.moc.cpp  statusnavigatebar.moc statusprogressbar.moc statuszoombar.moc paniconwidget.moc searchtextbar.moc colorgradientwidget.moc filesaveoptionsbox.moc histogramwidget.moc statusled.moc sidebar.moc splashscreen.moc curveswidget.moc squeezedcombobox.moc previewwidget.moc
+libcommonwidgets_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/histogramwidget.cpp $(srcdir)/colorgradientwidget.cpp $(srcdir)/curveswidget.cpp $(srcdir)/dlogoaction.cpp $(srcdir)/sidebar.cpp $(srcdir)/squeezedcombobox.cpp $(srcdir)/filesaveoptionsbox.cpp $(srcdir)/dpopupmenu.cpp $(srcdir)/statuszoombar.cpp $(srcdir)/statusnavigatebar.cpp $(srcdir)/statusprogressbar.cpp $(srcdir)/searchtextbar.cpp $(srcdir)/dcursortracker.cpp $(srcdir)/paniconwidget.cpp $(srcdir)/previewwidget.cpp $(srcdir)/splashscreen.cpp $(srcdir)/statusled.cpp dlogoaction.moc.cpp  statusprogressbar.moc statusnavigatebar.moc statuszoombar.moc paniconwidget.moc colorgradientwidget.moc searchtextbar.moc filesaveoptionsbox.moc histogramwidget.moc statusled.moc sidebar.moc splashscreen.moc curveswidget.moc squeezedcombobox.moc previewwidget.moc
 	@echo 'creating libcommonwidgets_la.all_cpp.cpp ...'; \
 	rm -f libcommonwidgets_la.all_cpp.files libcommonwidgets_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libcommonwidgets_la.all_cpp.final; \
--- digikam-0.9.4.orig/digikam/libs/greycstoration/Makefile.in
+++ digikam-0.9.4/digikam/libs/greycstoration/Makefile.in
@@ -687,6 +687,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 greycstorationwidget.moc: $(srcdir)/greycstorationwidget.h
 	$(MOC) $(srcdir)/greycstorationwidget.h -o greycstorationwidget.moc
--- digikam-0.9.4.orig/digikam/libs/dmetadata/Makefile.in
+++ digikam-0.9.4/digikam/libs/dmetadata/Makefile.in
@@ -683,6 +683,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/data/icons/Makefile.in
+++ digikam-0.9.4/digikam/data/icons/Makefile.in
@@ -514,824 +514,825 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
-KDE_DIST=hi22-action-ratiocrop.png hi64-app-digikam.png hi16-action-channelmixer.png hi16-action-perspective.png hi22-action-albumfoldernew.png hi48-action-addimagefolder.png hi32-action-digitalcam.png hi48-action-adjustlevels.png hi48-action-contrast.png hi32-app-digikamimageplugins.png hi48-action-antivignetting.png hi16-action-redeyes.png hi48-action-inpainting.png hi32-action-adjustcurves.png hi64-action-digitalcam.png hi22-action-addimagefolder.png hi16-action-oilpaint.png hi128-action-noisereduction.png hi32-action-shear.png hi64-action-whitebalance.png hi16-action-charcoaltool.png hi22-action-bordertool.png hi22-action-importfolders2albums.png hi48-action-charcoaltool.png hi22-action-editimage.png hi16-action-viewimage.png hi64-action-antivignetting.png hi16-action-albumfoldernew.png hi64-action-depth16to8.png hi32-action-inserttext.png hi128-action-depth8to16.png hisc-action-blurimage.svgz hisc-action-histogram.svgz hisc-action-slideshow.svgz hi32-action-filmgrain.png hi64-action-colorfx.png hi64-action-imagecomment.png hisc-action-sharpenimage.svgz hi22-action-noisereduction.png hi128-action-albumfoldercomment.png hisc-action-hotpixels.svgz hi22-action-histogram.png hi64-action-embosstool.png hi22-action-exifinfo.png hi32-action-imagecomment.png hi48-action-lensdistortion.png hi32-action-freerotation.png hisc-action-perspective.svgz hi64-action-raindrop.png hi16-action-importfolders2albums.png hi64-action-contrast.png hi128-action-contrast.png cr16-action-crop.png hi48-action-digitalcam.png hi48-action-channelmixer.png hi16-action-lensdistortion.png hi16-action-distortionfx.png cr48-action-crop.png hi32-action-colormanagement.png hi128-action-lensdistortion.png hi64-action-perspective.png hi48-action-imagecomment.png hi22-action-viewimage.png hi48-action-raindrop.png hi64-action-blurfx.png hi32-action-noisereduction.png hi128-action-antivignetting.png hi22-action-mirror.png hi32-action-depth8to16.png crsc-action-fileopen.svgz hi22-action-oilpaint.png hi22-action-bwtonal.png hi64-action-albumfoldercomment.png hi32-action-flip.png hi128-action-channelmixer.png Makefile.in hi64-action-albumfoldernew.png hi32-action-blurimage.png hi32-action-oilpaint.png hi16-action-depth16to8.png hi16-action-shear.png cr22-action-rotate_cw.png hi32-action-albumfoldercomment.png hi48-action-whitebalance.png hi22-action-slideshow.png hisc-action-adjustcurves.svgz hi64-action-infrared.png hi48-action-restoration.png hi48-action-redeyes.png hi128-action-slideshow.png hi22-action-colormanagement.png cr16-action-fileopen.png hi48-action-embosstool.png hisc-action-invertimage.svgz hi128-action-importfolders2albums.png hisc-action-editimage.svgz hisc-action-antivignetting.svgz hi64-action-inpainting.png hi48-action-filmgrain.png hi22-action-channelmixer.png hisc-action-contrast.svgz hi32-action-adjusthsl.png hisc-action-freerotation.svgz hi48-action-hotpixels.png hisc-action-inserttext.svgz hi128-action-colormanagement.png hi32-action-lighttableadd.png hi64-action-restoration.png hi32-action-mirror.png cr22-action-crop.png hi16-action-embosstool.png hi128-action-adjusthsl.png hi48-action-viewimage.png hi32-action-distortionfx.png hi64-action-invertimage.png hi32-action-depth16to8.png hi64-action-charcoaltool.png hi16-action-adjustrgb.png hi48-action-flip.png hi64-action-hotpixels.png hi22-action-embosstool.png hi64-action-bwtonal.png hi48-action-slideshow.png hi22-action-inserttext.png hi32-action-viewimage.png hi32-action-invertimage.png hi22-action-colorfx.png hi128-action-digitalcam.png hi22-action-resize_image.png cr32-action-fileopen.png hi22-action-imagecomment.png hisc-action-bordertool.svgz hi16-action-infrared.png hi128-action-sharpenimage.png hisc-action-inpainting.svgz hi64-action-shear.png hi16-action-blurfx.png hi16-action-hotpixels.png hi64-action-inserttext.png hi128-action-perspective.png hi128-action-redeyes.png hi32-action-importfolders2albums.png hi16-action-whitebalance.png hi48-action-noisereduction.png hisc-action-autocorrection.svgz hi16-action-flip.png hi16-action-blurimage.png hi32-action-raindrop.png hi64-action-viewimage.png hi128-action-exifinfo.png hi64-action-editimage.png hi22-action-infrared.png hisc-action-imagecomment.svgz hi48-action-sharpenimage.png hi48-action-ratiocrop.png hi48-action-oilpaint.png hi32-action-whitebalance.png hisc-action-bwtonal.svgz hi22-action-shear.png hi64-action-addimagefolder.png hi64-action-ratiocrop.png hi22-action-adjusthsl.png hi128-action-invertimage.png hi22-action-freerotation.png hi64-action-adjustlevels.png hi128-action-hotpixels.png hi48-action-mirror.png hi128-action-oilpaint.png hi48-action-adjustcurves.png hi48-action-albumfoldernew.png hi32-action-redeyes.png hi48-action-editimage.png hi64-action-histogram.png hi22-action-digitalcam.png hisc-action-albumfoldercomment.svgz hi22-action-adjustcurves.png hi128-action-inpainting.png hi48-action-resize_image.png hi128-action-freerotation.png hi64-action-lensdistortion.png hisc-action-channelmixer.svgz hi16-action-mirror.png hi64-action-slideshow.png hi32-action-contrast.png hi22-action-lensdistortion.png cr64-action-crop.png hi22-action-distortionfx.png hi22-app-digikam.png hi48-action-perspective.png hi16-action-inpainting.png hi16-action-antivignetting.png hi16-action-colormanagement.png hisc-action-blurfx.svgz hi16-action-adjusthsl.png hi16-action-contrast.png hi32-action-superimpose.png hi16-action-resize_image.png hi64-action-adjusthsl.png crsc-action-crop.svgz hi32-action-ratiocrop.png hi22-action-sharpenimage.png hi48-action-exifinfo.png hi22-action-perspective.png hisc-action-ratiocrop.svgz hi16-action-superimpose.png hisc-action-addimagefolder.svgz hi16-action-ratiocrop.png hi32-action-bordertool.png hi22-action-depth8to16.png hi48-action-blurfx.png hi128-action-restoration.png hi16-app-digikam.png cr32-action-crop.png hi128-action-infrared.png hi64-action-freerotation.png hi48-action-blurimage.png hi16-action-noisereduction.png hi64-action-redeyes.png hi32-action-antivignetting.png hi128-action-blurimage.png hi16-action-exifinfo.png hi22-action-albumfoldercomment.png hi128-action-editimage.png hisc-action-distortionfx.svgz hi16-action-restoration.png hi64-action-texture.png hi32-action-lensdistortion.png cr128-action-rotate_cw.png crsc-action-rotate_cw.svgz hi48-action-shear.png hi128-action-whitebalance.png hi16-action-bwtonal.png hi48-action-superimpose.png hi32-action-channelmixer.png hi64-action-resize_image.png hi48-action-colormanagement.png hi16-action-inserttext.png hi16-action-freerotation.png hisc-action-shear.svgz hi64-action-depth8to16.png hi128-action-colorfx.png hi64-action-blurimage.png hi128-action-ratiocrop.png hi64-action-sharpenimage.png hi16-action-colorfx.png hi128-action-adjustlevels.png hi22-action-flip.png hi32-action-adjustlevels.png hi48-action-invertimage.png hi22-action-superimpose.png cr22-action-fileopen.png hi16-action-editimage.png hi16-action-autocorrection.png hisc-action-superimpose.svgz hisc-action-depth16to8.svgz hi64-action-channelmixer.png hi128-action-raindrop.png hisc-action-albumfoldernew.svgz hi32-action-colorfx.png hi32-app-digikam.png hi22-action-adjustrgb.png hi22-action-contrast.png hisc-action-importfolders2albums.svgz hi32-action-restoration.png hi32-action-editimage.png hisc-action-whitebalance.svgz hi48-action-albumfoldercomment.png cr64-action-fileopen.png hi64-action-bordertool.png hi22-action-redeyes.png hi32-action-adjustrgb.png hi22-action-whitebalance.png hi22-action-antivignetting.png hi32-action-bwtonal.png hi128-action-bwtonal.png hi48-action-distortionfx.png hi64-action-importfolders2albums.png cr32-action-rotate_cw.png hi64-action-filmgrain.png hi16-action-slideshow.png hi64-action-noisereduction.png hi48-action-histogram.png hi48-action-freerotation.png hisc-action-filmgrain.svgz hi32-action-blurfx.png hi32-action-charcoaltool.png cr48-action-fileopen.png hi64-action-colormanagement.png cr128-action-fileopen.png hi48-action-colorfx.png cr48-action-rotate_cw.png hi48-action-importfolders2albums.png hi32-action-perspective.png hi32-action-slideshow.png hi128-action-blurfx.png hi128-action-imagecomment.png hi16-action-addimagefolder.png hi128-action-texture.png hi48-action-depth16to8.png hi32-action-resize_image.png hisc-action-restoration.svgz cr128-action-crop.png hi128-action-embosstool.png hisc-action-exifinfo.svgz hi22-action-restoration.png hi16-action-digitalcam.png hi48-action-bwtonal.png hi16-action-sharpenimage.png hi16-action-histogram.png hi128-action-autocorrection.png hi64-action-adjustcurves.png hi128-action-adjustcurves.png hi16-action-adjustlevels.png hi128-action-distortionfx.png hi128-action-inserttext.png hi22-action-charcoaltool.png hi48-action-inserttext.png cr16-action-rotate_cw.png hi128-action-addimagefolder.png hi48-action-infrared.png cr64-action-rotate_cw.png hisc-action-resize_image.svgz hisc-action-depth8to16.svgz hi48-app-digikam.png hi32-action-digikamimageplugins.png hi22-action-inpainting.png hi32-action-albumfoldernew.png hi128-action-viewimage.png hi16-action-filmgrain.png hi22-action-invertimage.png hi48-action-bordertool.png hi16-action-raindrop.png hisc-action-texture.svgz hi16-action-adjustcurves.png hi64-action-superimpose.png hi16-action-texture.png hi16-action-albumfoldercomment.png hi128-action-filmgrain.png hi32-action-texture.png hi32-action-lighttable.png hi128-action-superimpose.png hi48-action-depth8to16.png hi128-app-digikam.png hi64-action-autocorrection.png hi64-action-oilpaint.png hi22-action-adjustlevels.png hi32-action-histogram.png hi16-action-bordertool.png hi64-action-distortionfx.png hi128-action-adjustrgb.png hi22-action-hotpixels.png hi32-action-addimagefolder.png hisc-action-noisereduction.svgz hi22-action-raindrop.png hi22-action-filmgrain.png hi32-action-embosstool.png hi16-action-invertimage.png hi32-action-inpainting.png hi48-action-autocorrection.png hi22-action-texture.png hi64-action-exifinfo.png hi32-action-sharpenimage.png hi128-action-depth16to8.png hi22-action-autocorrection.png hi32-action-autocorrection.png hi128-action-shear.png hi128-action-histogram.png hisc-action-adjustrgb.svgz hi32-action-exifinfo.png hi128-action-bordertool.png hi48-action-adjusthsl.png hi64-action-adjustrgb.png hi22-action-blurfx.png hi22-action-blurimage.png hi128-action-albumfoldernew.png hisc-action-colormanagement.svgz hi22-action-depth16to8.png hisc-action-adjustlevels.svgz hi16-action-depth8to16.png hi128-action-resize_image.png hi48-action-texture.png hi32-action-infrared.png hi48-action-adjustrgb.png hi32-action-hotpixels.png Makefile.am hi128-action-charcoaltool.png hi16-action-imagecomment.png 
+KDE_DIST=hi22-action-ratiocrop.png hi64-app-digikam.png hi16-action-channelmixer.png hi16-action-perspective.png hi22-action-albumfoldernew.png hi48-action-addimagefolder.png hi32-action-digitalcam.png hi48-action-adjustlevels.png hi48-action-contrast.png hi32-app-digikamimageplugins.png hi48-action-antivignetting.png hi16-action-redeyes.png hi48-action-inpainting.png hi64-action-digitalcam.png hi32-action-adjustcurves.png hi16-action-oilpaint.png hi22-action-addimagefolder.png hi128-action-noisereduction.png hi32-action-shear.png hi64-action-whitebalance.png hi16-action-charcoaltool.png hi22-action-bordertool.png hi22-action-importfolders2albums.png hi48-action-charcoaltool.png hi22-action-editimage.png hi16-action-viewimage.png hi64-action-antivignetting.png hi64-action-depth16to8.png hi32-action-inserttext.png hi16-action-albumfoldernew.png hi128-action-depth8to16.png hisc-action-blurimage.svgz hisc-action-histogram.svgz hisc-action-slideshow.svgz hi32-action-filmgrain.png hi64-action-colorfx.png hi64-action-imagecomment.png hisc-action-sharpenimage.svgz hi22-action-noisereduction.png hi128-action-albumfoldercomment.png hisc-action-hotpixels.svgz hi22-action-histogram.png hi64-action-embosstool.png hi32-action-imagecomment.png hi22-action-exifinfo.png hi48-action-lensdistortion.png hi32-action-freerotation.png hisc-action-perspective.svgz hi16-action-importfolders2albums.png hi64-action-raindrop.png hi128-action-contrast.png hi64-action-contrast.png cr16-action-crop.png hi48-action-digitalcam.png hi16-action-lensdistortion.png hi48-action-channelmixer.png hi16-action-distortionfx.png cr48-action-crop.png hi128-action-lensdistortion.png hi32-action-colormanagement.png hi64-action-perspective.png hi48-action-imagecomment.png hi22-action-viewimage.png hi48-action-raindrop.png hi64-action-blurfx.png hi32-action-noisereduction.png hi128-action-antivignetting.png hi32-action-depth8to16.png hi22-action-mirror.png crsc-action-fileopen.svgz hi22-action-oilpaint.png hi22-action-bwtonal.png hi128-action-channelmixer.png hi64-action-albumfoldercomment.png hi32-action-flip.png Makefile.in hi64-action-albumfoldernew.png hi32-action-blurimage.png hi32-action-oilpaint.png hi16-action-depth16to8.png hi16-action-shear.png cr22-action-rotate_cw.png hi22-action-slideshow.png hi48-action-whitebalance.png hi32-action-albumfoldercomment.png hisc-action-adjustcurves.svgz hi64-action-infrared.png hi48-action-restoration.png hi48-action-redeyes.png hi128-action-slideshow.png hi22-action-colormanagement.png cr16-action-fileopen.png hi48-action-embosstool.png hisc-action-invertimage.svgz hi128-action-importfolders2albums.png hisc-action-editimage.svgz hisc-action-antivignetting.svgz hi64-action-inpainting.png hi48-action-filmgrain.png hi22-action-channelmixer.png hi32-action-adjusthsl.png hisc-action-contrast.svgz hisc-action-freerotation.svgz hi48-action-hotpixels.png hisc-action-inserttext.svgz hi128-action-colormanagement.png hi32-action-lighttableadd.png hi64-action-restoration.png hi32-action-mirror.png hi16-action-embosstool.png cr22-action-crop.png hi128-action-adjusthsl.png hi48-action-viewimage.png hi32-action-distortionfx.png hi64-action-invertimage.png hi32-action-depth16to8.png hi64-action-charcoaltool.png hi16-action-adjustrgb.png hi48-action-flip.png hi22-action-embosstool.png hi64-action-hotpixels.png hi48-action-slideshow.png hi64-action-bwtonal.png hi22-action-inserttext.png hi32-action-viewimage.png hi32-action-invertimage.png hi128-action-digitalcam.png hi22-action-colorfx.png hi22-action-resize_image.png cr32-action-fileopen.png hi22-action-imagecomment.png hisc-action-bordertool.svgz hi16-action-infrared.png hi128-action-sharpenimage.png hisc-action-inpainting.svgz hi64-action-shear.png hi16-action-blurfx.png hi16-action-hotpixels.png hi128-action-redeyes.png hi128-action-perspective.png hi64-action-inserttext.png hi32-action-importfolders2albums.png hi16-action-whitebalance.png hi48-action-noisereduction.png hisc-action-autocorrection.svgz hi16-action-flip.png hi32-action-raindrop.png hi16-action-blurimage.png hi128-action-exifinfo.png hi64-action-viewimage.png hi64-action-editimage.png hi22-action-infrared.png hisc-action-imagecomment.svgz hi48-action-ratiocrop.png hi48-action-sharpenimage.png hi48-action-oilpaint.png hi32-action-whitebalance.png hisc-action-bwtonal.svgz hi22-action-shear.png hi64-action-addimagefolder.png hi64-action-ratiocrop.png hi22-action-adjusthsl.png hi22-action-freerotation.png hi128-action-invertimage.png hi64-action-adjustlevels.png hi128-action-hotpixels.png hi48-action-mirror.png hi128-action-oilpaint.png hi48-action-adjustcurves.png hi48-action-albumfoldernew.png hi32-action-redeyes.png hi48-action-editimage.png hi64-action-histogram.png hi22-action-digitalcam.png hisc-action-albumfoldercomment.svgz hi22-action-adjustcurves.png hi128-action-inpainting.png hi48-action-resize_image.png hisc-action-channelmixer.svgz hi64-action-lensdistortion.png hi128-action-freerotation.png hi16-action-mirror.png hi64-action-slideshow.png hi32-action-contrast.png hi22-action-lensdistortion.png cr64-action-crop.png hi22-action-distortionfx.png hi48-action-perspective.png hi22-app-digikam.png hi16-action-inpainting.png hi16-action-antivignetting.png hi16-action-colormanagement.png hisc-action-blurfx.svgz hi16-action-adjusthsl.png hi16-action-contrast.png hi32-action-superimpose.png hi16-action-resize_image.png crsc-action-crop.svgz hi64-action-adjusthsl.png hi32-action-ratiocrop.png hi22-action-sharpenimage.png hi48-action-exifinfo.png hi22-action-perspective.png hisc-action-ratiocrop.svgz hi16-action-superimpose.png hi16-action-ratiocrop.png hisc-action-addimagefolder.svgz hi32-action-bordertool.png hi22-action-depth8to16.png hi48-action-blurfx.png hi128-action-restoration.png hi16-app-digikam.png cr32-action-crop.png hi64-action-freerotation.png hi128-action-infrared.png hi48-action-blurimage.png hi16-action-noisereduction.png hi64-action-redeyes.png hi32-action-antivignetting.png hi128-action-blurimage.png hi16-action-exifinfo.png hi22-action-albumfoldercomment.png hi128-action-editimage.png hisc-action-distortionfx.svgz hi16-action-restoration.png hi64-action-texture.png hi32-action-lensdistortion.png cr128-action-rotate_cw.png crsc-action-rotate_cw.svgz hi48-action-shear.png hi128-action-whitebalance.png hi16-action-bwtonal.png hi48-action-superimpose.png hi32-action-channelmixer.png hi64-action-resize_image.png hi48-action-colormanagement.png hi16-action-inserttext.png hi16-action-freerotation.png hisc-action-shear.svgz hi64-action-depth8to16.png hi128-action-colorfx.png hi64-action-blurimage.png hi128-action-ratiocrop.png hi64-action-sharpenimage.png hi16-action-colorfx.png hi128-action-adjustlevels.png hi22-action-flip.png hi32-action-adjustlevels.png hi48-action-invertimage.png hi22-action-superimpose.png cr22-action-fileopen.png hi16-action-editimage.png hi16-action-autocorrection.png hisc-action-superimpose.svgz hi64-action-channelmixer.png hisc-action-depth16to8.svgz hi128-action-raindrop.png hisc-action-albumfoldernew.svgz hi32-app-digikam.png hi32-action-colorfx.png hi22-action-adjustrgb.png hi22-action-contrast.png hisc-action-importfolders2albums.svgz hi32-action-restoration.png hi32-action-editimage.png hisc-action-whitebalance.svgz cr64-action-fileopen.png hi48-action-albumfoldercomment.png hi64-action-bordertool.png hi22-action-redeyes.png hi32-action-adjustrgb.png hi22-action-whitebalance.png hi22-action-antivignetting.png hi32-action-bwtonal.png hi128-action-bwtonal.png hi48-action-distortionfx.png cr32-action-rotate_cw.png hi64-action-importfolders2albums.png hi64-action-filmgrain.png hi16-action-slideshow.png hi64-action-noisereduction.png hi48-action-histogram.png hi48-action-freerotation.png hisc-action-filmgrain.svgz hi32-action-blurfx.png cr48-action-fileopen.png hi32-action-charcoaltool.png hi64-action-colormanagement.png cr128-action-fileopen.png hi48-action-colorfx.png cr48-action-rotate_cw.png hi48-action-importfolders2albums.png hi32-action-perspective.png hi32-action-slideshow.png hi128-action-texture.png hi16-action-addimagefolder.png hi128-action-blurfx.png hi128-action-imagecomment.png hi32-action-resize_image.png hi48-action-depth16to8.png hisc-action-restoration.svgz cr128-action-crop.png hi128-action-embosstool.png hisc-action-exifinfo.svgz hi22-action-restoration.png hi16-action-digitalcam.png hi48-action-bwtonal.png hi16-action-sharpenimage.png hi16-action-histogram.png hi64-action-adjustcurves.png hi128-action-autocorrection.png hi128-action-adjustcurves.png hi16-action-adjustlevels.png hi128-action-distortionfx.png hi128-action-inserttext.png hi22-action-charcoaltool.png hi48-action-inserttext.png cr16-action-rotate_cw.png hi128-action-addimagefolder.png cr64-action-rotate_cw.png hi48-action-infrared.png hisc-action-resize_image.svgz hisc-action-depth8to16.svgz hi48-app-digikam.png hi32-action-digikamimageplugins.png hi22-action-inpainting.png hi32-action-albumfoldernew.png hi128-action-viewimage.png hi16-action-filmgrain.png hi22-action-invertimage.png hi48-action-bordertool.png hi16-action-raindrop.png hisc-action-texture.svgz hi16-action-adjustcurves.png hi64-action-superimpose.png hi16-action-texture.png hi16-action-albumfoldercomment.png hi128-action-filmgrain.png hi32-action-lighttable.png hi32-action-texture.png hi48-action-depth8to16.png hi128-action-superimpose.png hi128-app-digikam.png hi64-action-autocorrection.png hi64-action-oilpaint.png hi22-action-adjustlevels.png hi64-action-distortionfx.png hi32-action-histogram.png hi16-action-bordertool.png hi128-action-adjustrgb.png hi32-action-addimagefolder.png hi22-action-hotpixels.png hisc-action-noisereduction.svgz hi22-action-raindrop.png hi22-action-filmgrain.png hi16-action-invertimage.png hi32-action-embosstool.png hi48-action-autocorrection.png hi32-action-inpainting.png hi22-action-texture.png hi64-action-exifinfo.png hi32-action-sharpenimage.png hi128-action-depth16to8.png hi32-action-autocorrection.png hi22-action-autocorrection.png hi128-action-histogram.png hi128-action-shear.png hisc-action-adjustrgb.svgz hi32-action-exifinfo.png hi128-action-bordertool.png hi48-action-adjusthsl.png hi64-action-adjustrgb.png hi22-action-blurfx.png hi22-action-blurimage.png hi128-action-albumfoldernew.png hisc-action-colormanagement.svgz hi22-action-depth16to8.png hisc-action-adjustlevels.svgz hi128-action-resize_image.png hi16-action-depth8to16.png hi48-action-texture.png hi32-action-infrared.png hi48-action-adjustrgb.png Makefile.am hi32-action-hotpixels.png hi128-action-charcoaltool.png hi16-action-imagecomment.png 
 
 #>+ 2
 docs-am:
 
 #>+ 812
 install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions
-	$(INSTALL_DATA) $(srcdir)/hi64-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/sharpenimage.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions
-	$(INSTALL_DATA) $(srcdir)/hisc-action-hotpixels.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/hotpixels.svgz
 	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/hi16-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustrgb.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/autocorrection.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldernew.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/cr32-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/fileopen.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/hi22-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/shear.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/digitalcam.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-editimage.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/editimage.svgz
-	$(INSTALL_DATA) $(srcdir)/hi22-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldernew.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-histogram.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/histogram.svgz
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions
-	$(INSTALL_DATA) $(srcdir)/hi48-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/hotpixels.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/depth16to8.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/bordertool.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/antivignetting.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/charcoaltool.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/perspective.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjusthsl.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/addimagefolder.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions
-	$(INSTALL_DATA) $(srcdir)/hi128-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/exifinfo.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/apps/digikam.png
 	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/hi32-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inpainting.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth8to16.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/depth8to16.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-adjustcurves.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustcurves.svgz
-	$(INSTALL_DATA) $(srcdir)/hi128-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldernew.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-channelmixer.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/channelmixer.svgz
-	$(INSTALL_DATA) $(srcdir)/hi64-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colormanagement.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-texture.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/texture.svgz
-	$(INSTALL_DATA) $(srcdir)/hi128-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/imagecomment.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/antivignetting.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bordertool.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inserttext.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/22x22/apps
-	$(INSTALL_DATA) $(srcdir)/hi22-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/apps/digikam.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/superimpose.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/whitebalance.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/superimpose.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/channelmixer.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/contrast.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/redeyes.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bwtonal.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/filmgrain.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/invertimage.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/raindrop.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/exifinfo.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/lensdistortion.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/viewimage.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/redeyes.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustcurves.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/infrared.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/channelmixer.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/imagecomment.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/infrared.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/blurfx.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/distortionfx.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/perspective.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-whitebalance.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/whitebalance.svgz
-	$(INSTALL_DATA) $(srcdir)/hi128-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth8to16.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-blurimage.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurimage.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/exifinfo.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/mirror.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/distortionfx.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/embosstool.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/infrared.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-blurfx.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurfx.svgz
-	$(INSTALL_DATA) $(srcdir)/hi128-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/viewimage.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/whitebalance.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/crop.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/resize_image.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjusthsl.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/shear.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/whitebalance.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colorfx.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/digitalcam.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustrgb.png
 	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions
 	$(INSTALL_DATA) $(srcdir)/cr128-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-addimagefolder.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/addimagefolder.svgz
-	$(INSTALL_DATA) $(srcdir)/hi16-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/importfolders2albums.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/imagecomment.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/digitalcam.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-adjustrgb.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustrgb.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-superimpose.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/superimpose.svgz
-	$(INSTALL_DATA) $(srcdir)/hi22-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/invertimage.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/exifinfo.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions
+	$(INSTALL_DATA) $(srcdir)/hi48-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/channelmixer.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/mirror.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/slideshow.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldercomment.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions
+	$(INSTALL_DATA) $(srcdir)/hi22-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/depth16to8.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/contrast.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldercomment.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions
+	$(INSTALL_DATA) $(srcdir)/hisc-action-importfolders2albums.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/importfolders2albums.svgz
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions
+	$(INSTALL_DATA) $(srcdir)/hi128-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/texture.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bordertool.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions
+	$(INSTALL_DATA) $(srcdir)/hi64-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/whitebalance.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/noisereduction.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/freerotation.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurimage.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/antivignetting.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-contrast.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/contrast.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-bwtonal.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bwtonal.svgz
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions
+	$(INSTALL_DATA) $(srcdir)/cr22-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/crop.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/sharpenimage.png
 	$(INSTALL_DATA) $(srcdir)/hi64-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/raindrop.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/channelmixer.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldernew.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/blurfx.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/distortionfx.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/autocorrection.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/ratiocrop.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-distortionfx.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/distortionfx.svgz
-	$(INSTALL_DATA) $(srcdir)/hi64-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/charcoaltool.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/raindrop.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inserttext.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/perspective.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/histogram.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/editimage.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/slideshow.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/whitebalance.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/hotpixels.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/texture.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustcurves.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/albumfoldercomment.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/perspective.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/invertimage.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/ratiocrop.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/restoration.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/texture.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurimage.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-colormanagement.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/colormanagement.svgz
-	$(INSTALL_DATA) $(srcdir)/hi32-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/importfolders2albums.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/antivignetting.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/filmgrain.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inserttext.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/infrared.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/exifinfo.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/inpainting.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth16to8.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/imagecomment.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/restoration.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/viewimage.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-perspective.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/perspective.svgz
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions
-	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/charcoaltool.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/histogram.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/slideshow.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions
-	$(INSTALL_DATA) $(srcdir)/crsc-action-fileopen.svgz $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/fileopen.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/perspective.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/editimage.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustrgb.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-antivignetting.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/antivignetting.svgz
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/cr128-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/crop.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/flip.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustlevels.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/slideshow.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inserttext.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/invertimage.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/viewimage.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bwtonal.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/autocorrection.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/hotpixels.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-exifinfo.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/exifinfo.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/noisereduction.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-hotpixels.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/hotpixels.svgz
 	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/64x64/apps
 	$(INSTALL_DATA) $(srcdir)/hi64-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/apps/digikam.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/imagecomment.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/addimagefolder.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/redeyes.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/digitalcam.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-freerotation.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/freerotation.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/whitebalance.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions
-	$(INSTALL_DATA) $(srcdir)/cr64-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/raindrop.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/oilpaint.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/ratiocrop.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/contrast.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustcurves.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/digitalcam.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustrgb.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colorfx.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/sharpenimage.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-filmgrain.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/filmgrain.svgz
-	$(INSTALL_DATA) $(srcdir)/hi16-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/embosstool.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/blurfx.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/ratiocrop.png
 	$(INSTALL_DATA) $(srcdir)/hi22-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/noisereduction.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colorfx.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/editimage.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/exifinfo.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bwtonal.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/128x128/apps
-	$(INSTALL_DATA) $(srcdir)/hi128-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/apps/digikam.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/autocorrection.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-restoration.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/restoration.svgz
-	$(INSTALL_DATA) $(srcdir)/cr64-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/invertimage.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/distortionfx.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bordertool.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/perspective.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/restoration.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/texture.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/freerotation.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/infrared.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-imagecomment.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/imagecomment.svgz
+	$(INSTALL_DATA) $(srcdir)/hi128-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/perspective.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-histogram.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/histogram.svgz
 	$(INSTALL_DATA) $(srcdir)/hi48-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/superimpose.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/contrast.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/filmgrain.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/superimpose.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/inserttext.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inpainting.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/contrast.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/depth16to8.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustlevels.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/embosstool.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-editimage.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/editimage.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/blurimage.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/antivignetting.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inserttext.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-adjustlevels.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustlevels.svgz
+	$(INSTALL_DATA) $(srcdir)/hi64-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/hotpixels.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/importfolders2albums.png
 	$(INSTALL_DATA) $(srcdir)/hi128-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/filmgrain.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colorfx.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions
+	$(INSTALL_DATA) $(srcdir)/cr16-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/infrared.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-ratiocrop.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/ratiocrop.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjusthsl.png
 	$(INSTALL_DATA) $(srcdir)/hi128-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/resize_image.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/importfolders2albums.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/viewimage.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions
+	$(INSTALL_DATA) $(srcdir)/cr64-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/addimagefolder.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colormanagement.png
 	$(INSTALL_DATA) $(srcdir)/hi48-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/embosstool.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/contrast.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldercomment.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/superimpose.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustcurves.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/distortionfx.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/oilpaint.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inpainting.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/freerotation.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth16to8.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjusthsl.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth8to16.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/addimagefolder.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/filmgrain.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/hi32-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps/digikam.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/resize_image.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-lighttableadd.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttableadd.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-albumfoldercomment.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldercomment.svgz
-	$(INSTALL_DATA) $(srcdir)/hi64-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/embosstool.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-exifinfo.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/exifinfo.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/bwtonal.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldercomment.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/distortionfx.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-imagecomment.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/imagecomment.svgz
-	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate_cw.svgz $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/rotate_cw.svgz
-	$(INSTALL_DATA) $(srcdir)/hi16-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/lensdistortion.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/viewimage.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/shear.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustcurves.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/sharpenimage.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/flip.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions
+	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/blurfx.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/viewimage.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inpainting.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/resize_image.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/slideshow.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/invertimage.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/hotpixels.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inserttext.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colorfx.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/whitebalance.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/superimpose.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldernew.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bwtonal.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/exifinfo.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/superimpose.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/viewimage.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/distortionfx.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/autocorrection.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/texture.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/redeyes.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/infrared.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-inpainting.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inpainting.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/digitalcam.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/redeyes.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-depth8to16.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth8to16.svgz
+	$(INSTALL_DATA) $(srcdir)/hi128-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/charcoaltool.png
 	$(INSTALL_DATA) $(srcdir)/hi48-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/restoration.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/noisereduction.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/slideshow.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustcurves.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-slideshow.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/slideshow.svgz
+	$(INSTALL_DATA) $(srcdir)/hi128-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/raindrop.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/contrast.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-lighttableadd.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttableadd.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/digitalcam.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/editimage.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/freerotation.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/flip.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/redeyes.png
 	$(INSTALL_DATA) $(srcdir)/hi32-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/shear.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/addimagefolder.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/autocorrection.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/filmgrain.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/hotpixels.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/invertimage.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-antivignetting.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/antivignetting.svgz
+	$(INSTALL_DATA) $(srcdir)/hi64-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colorfx.png
 	$(INSTALL_DATA) $(srcdir)/hi32-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/channelmixer.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/digitalcam.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustcurves.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/whitebalance.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/texture.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/histogram.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/blurfx.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/noisereduction.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurfx.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/editimage.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colorfx.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colorfx.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/filmgrain.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/exifinfo.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/noisereduction.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/antivignetting.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/distortionfx.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/distortionfx.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/ratiocrop.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/shear.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions
+	$(INSTALL_DATA) $(srcdir)/crsc-action-rotate_cw.svgz $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/rotate_cw.svgz
+	$(INSTALL_DATA) $(srcdir)/hi22-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/mirror.png
 	$(INSTALL_DATA) $(srcdir)/hi64-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/lensdistortion.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/texture.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/channelmixer.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/importfolders2albums.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/filmgrain.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/sharpenimage.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colormanagement.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/channelmixer.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/infrared.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/redeyes.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-sharpenimage.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/sharpenimage.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inpainting.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/resize_image.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-noisereduction.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/noisereduction.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-bordertool.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bordertool.svgz
-	$(INSTALL_DATA) $(srcdir)/hi128-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/antivignetting.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/importfolders2albums.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjusthsl.png
-	$(INSTALL_DATA) $(srcdir)/cr64-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/crop.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/resize_image.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/22x22/apps
+	$(INSTALL_DATA) $(srcdir)/hi22-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/apps/digikam.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustcurves.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/antivignetting.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustcurves.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/flip.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-digikamimageplugins.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/digikamimageplugins.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/oilpaint.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/importfolders2albums.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colorfx.png
-	$(INSTALL_DATA) $(srcdir)/cr32-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/rotate_cw.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/slideshow.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/blurimage.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/raindrop.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/mirror.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/histogram.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bordertool.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/redeyes.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustlevels.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/charcoaltool.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colormanagement.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-inserttext.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inserttext.svgz
-	$(INSTALL_DATA) $(srcdir)/hi22-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inpainting.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjusthsl.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bwtonal.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldercomment.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/freerotation.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/filmgrain.png
+	$(INSTALL_DATA) $(srcdir)/cr16-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/crop.png
 	$(INSTALL_DATA) $(srcdir)/hi48-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/albumfoldernew.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/noisereduction.png
-	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/hi16-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/apps/digikam.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/antivignetting.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/mirror.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustlevels.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurimage.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/blurimage.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-resize_image.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/resize_image.svgz
-	$(INSTALL_DATA) $(srcdir)/hi64-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bwtonal.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bwtonal.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/editimage.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/charcoaltool.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/embosstool.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/sharpenimage.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/charcoaltool.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/flip.png
+	$(INSTALL_DATA) $(srcdir)/cr32-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/crop.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/lensdistortion.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/exifinfo.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/hi48-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/apps/digikam.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/blurfx.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/infrared.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/mirror.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colorfx.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inserttext.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/redeyes.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/shear.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/filmgrain.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/perspective.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/imagecomment.png
 	$(INSTALL_DATA) $(srcdir)/hisc-action-shear.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/shear.svgz
-	$(INSTALL_DATA) $(srcdir)/hi128-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/noisereduction.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lensdistortion.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/oilpaint.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/superimpose.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/charcoaltool.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/shear.png
-	$(INSTALL_DATA) $(srcdir)/cr22-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/crop.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bordertool.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/depth16to8.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/perspective.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldercomment.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/freerotation.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-addimagefolder.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/addimagefolder.svgz
 	$(INSTALL_DATA) $(srcdir)/hi22-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/raindrop.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-bwtonal.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bwtonal.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/flip.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/oilpaint.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colorfx.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/invertimage.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldernew.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/sharpenimage.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/freerotation.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldercomment.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-lighttable.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttable.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/antivignetting.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inserttext.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth16to8.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/importfolders2albums.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/viewimage.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/hotpixels.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/viewimage.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bordertool.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/embosstool.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-albumfoldernew.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldernew.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-autocorrection.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/autocorrection.svgz
-	$(INSTALL_DATA) $(srcdir)/hi128-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/sharpenimage.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-noisereduction.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/noisereduction.svgz
+	$(INSTALL_DATA) $(srcdir)/hi22-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/invertimage.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/addimagefolder.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inserttext.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/autocorrection.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inpainting.png
 	$(INSTALL_DATA) $(srcdir)/crsc-action-crop.svgz $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/crop.svgz
-	$(INSTALL_DATA) $(srcdir)/hi64-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/editimage.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/raindrop.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/restoration.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/raindrop.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/whitebalance.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/shear.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/embosstool.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/channelmixer.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/inpainting.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurfx.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/slideshow.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/blurfx.png
 	$(INSTALL_DATA) $(srcdir)/hi32-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/hotpixels.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bwtonal.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/sharpenimage.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/autocorrection.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/noisereduction.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/invertimage.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/resize_image.png
+	$(INSTALL_DATA) $(srcdir)/cr128-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-resize_image.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/resize_image.svgz
+	$(INSTALL_DATA) $(srcdir)/hi22-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/channelmixer.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bwtonal.png
+	$(INSTALL_DATA) $(srcdir)/cr22-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/texture.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/embosstool.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-autocorrection.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/autocorrection.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/exifinfo.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/antivignetting.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth8to16.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjusthsl.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/ratiocrop.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/contrast.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-whitebalance.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/whitebalance.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-blurfx.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurfx.svgz
+	$(INSTALL_DATA) $(srcdir)/hi128-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/importfolders2albums.png
+	$(INSTALL_DATA) $(srcdir)/cr64-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/crop.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inserttext.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldercomment.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inpainting.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldernew.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/embosstool.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/autocorrection.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/histogram.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/exifinfo.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/slideshow.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/imagecomment.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/whitebalance.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/viewimage.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/sharpenimage.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-inserttext.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inserttext.svgz
+	$(INSTALL_DATA) $(srcdir)/hi48-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/ratiocrop.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-filmgrain.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/filmgrain.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/infrared.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/invertimage.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/lensdistortion.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjusthsl.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/shear.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldernew.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/digitalcam.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/mirror.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/oilpaint.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustlevels.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps
 	$(INSTALL_DATA) $(srcdir)/hi32-app-digikamimageplugins.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps/digikamimageplugins.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/histogram.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/texture.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustrgb.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/whitebalance.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/histogram.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/flip.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/noisereduction.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/superimpose.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-adjustcurves.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustcurves.svgz
+	$(INSTALL_DATA) $(srcdir)/hi32-action-embosstool.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/embosstool.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldernew.png
+	$(INSTALL_DATA) $(srcdir)/cr64-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bordertool.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-whitebalance.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/whitebalance.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/importfolders2albums.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/depth8to16.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/bwtonal.png
 	$(INSTALL_DATA) $(srcdir)/hi48-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/redeyes.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/texture.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/autocorrection.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/addimagefolder.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/slideshow.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustlevels.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/hotpixels.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurfx.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/contrast.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-depth16to8.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth16to8.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/infrared.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/restoration.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/blurimage.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/albumfoldercomment.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/perspective.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/histogram.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth16to8.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-invertimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/invertimage.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-exifinfo.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/exifinfo.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustcurves.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/importfolders2albums.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-albumfoldernew.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldernew.png
+	$(INSTALL_DATA) $(srcdir)/cr128-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/crop.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions
+	$(INSTALL_DATA) $(srcdir)/cr48-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/crop.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-superimpose.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/superimpose.svgz
+	$(INSTALL_DATA) $(srcdir)/hi128-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/editimage.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurimage.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth16to8.png
 	$(INSTALL_DATA) $(srcdir)/hisc-action-invertimage.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/invertimage.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/editimage.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-adjustlevels.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustlevels.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-ratiocrop.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/ratiocrop.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-depth16to8.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth16to8.svgz
+	$(INSTALL_DATA) $(srcdir)/hi22-action-bwtonal.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bwtonal.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/editimage.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-lighttable.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttable.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-slideshow.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/slideshow.svgz
+	$(INSTALL_DATA) $(srcdir)/hi64-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth8to16.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-redeyes.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/redeyes.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-perspective.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/perspective.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-colorfx.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colorfx.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/contrast.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/lensdistortion.png
+	$(INSTALL_DATA) $(srcdir)/crsc-action-fileopen.svgz $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/fileopen.svgz
+	$(INSTALL_DATA) $(srcdir)/hi32-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/addimagefolder.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/16x16/apps
+	$(INSTALL_DATA) $(srcdir)/hi16-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/apps/digikam.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/addimagefolder.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/autocorrection.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bordertool.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustlevels.png
 	$(INSTALL_DATA) $(srcdir)/hi48-action-shear.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/shear.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/restoration.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/addimagefolder.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustrgb.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-albumfoldernew.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldernew.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-filmgrain.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/filmgrain.svgz
+	$(INSTALL_DATA) $(srcdir)/hi48-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth16to8.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/histogram.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/oilpaint.png
+	$(mkinstalldirs) $(DESTDIR)$(digikamicondir)/hicolor/128x128/apps
+	$(INSTALL_DATA) $(srcdir)/hi128-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/apps/digikam.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/perspective.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/channelmixer.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-digikamimageplugins.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/digikamimageplugins.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/bordertool.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth8to16.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-restoration.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/restoration.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/histogram.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-texture.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/texture.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-rotate_cw.png $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/rotate_cw.png
+	$(INSTALL_DATA) $(srcdir)/hi32-app-digikam.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps/digikam.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-importfolders2albums.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/importfolders2albums.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldercomment.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-antivignetting.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/antivignetting.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/sharpenimage.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/oilpaint.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-infrared.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/infrared.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/ratiocrop.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/contrast.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-distortionfx.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/distortionfx.svgz
 	$(INSTALL_DATA) $(srcdir)/hi22-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/depth8to16.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/lensdistortion.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/superimpose.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-flip.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/flip.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/imagecomment.png
 	$(INSTALL_DATA) $(srcdir)/hi64-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustlevels.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/histogram.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustlevels.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-depth8to16.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth8to16.svgz
-	$(INSTALL_DATA) $(srcdir)/hi22-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/blurfx.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-importfolders2albums.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/importfolders2albums.svgz
-	$(INSTALL_DATA) $(srcdir)/hi16-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/resize_image.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/freerotation.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/hotpixels.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-contrast.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/contrast.svgz
-	$(INSTALL_DATA) $(srcdir)/hi32-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/digitalcam.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inpainting.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-contrast.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/contrast.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-albumfoldercomment.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldercomment.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-inserttext.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/inserttext.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/imagecomment.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/oilpaint.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/texture.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/depth8to16.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/freerotation.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/charcoaltool.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustrgb.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/charcoaltool.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/blurimage.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/resize_image.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/blurimage.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/charcoaltool.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustrgb.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/freerotation.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-bordertool.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bordertool.svgz
+	$(INSTALL_DATA) $(srcdir)/cr22-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/fileopen.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-albumfoldercomment.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldercomment.svgz
+	$(INSTALL_DATA) $(srcdir)/hi128-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/restoration.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-raindrop.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/raindrop.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-adjustcurves.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustcurves.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/imagecomment.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-perspective.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/perspective.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-viewimage.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/viewimage.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-adjustrgb.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustrgb.svgz
+	$(INSTALL_DATA) $(srcdir)/cr48-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/fileopen.png
 	$(INSTALL_DATA) $(srcdir)/hi128-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/ratiocrop.png
-	$(INSTALL_DATA) $(srcdir)/hi128-action-superimpose.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/superimpose.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/ratiocrop.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bordertool.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustrgb.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-mirror.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/mirror.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/freerotation.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustrgb.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/restoration.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/crop.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-inpainting.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inpainting.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/lensdistortion.png
-	$(INSTALL_DATA) $(srcdir)/cr48-action-crop.png $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/crop.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-colormanagement.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/colormanagement.svgz
+	$(INSTALL_DATA) $(srcdir)/hi48-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/editimage.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-sharpenimage.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/sharpenimage.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-hotpixels.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/hotpixels.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/imagecomment.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/oilpaint.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-texture.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/texture.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjusthsl.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-addimagefolder.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/addimagefolder.png
 	$(INSTALL_DATA) $(srcdir)/hi32-action-depth16to8.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/depth16to8.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-noisereduction.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/noisereduction.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjusthsl.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/digitalcam.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/distortionfx.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-editimage.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/editimage.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/oilpaint.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lensdistortion.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/restoration.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-channelmixer.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/channelmixer.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustrgb.png
 	$(INSTALL_DATA) $(srcdir)/hi48-action-blurimage.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/blurimage.png
-	$(INSTALL_DATA) $(srcdir)/cr128-action-fileopen.png $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/fileopen.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-blurfx.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurfx.png
-	$(INSTALL_DATA) $(srcdir)/hi64-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjusthsl.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-freerotation.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/freerotation.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/digikam.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-	$(INSTALL_DATA) $(srcdir)/hi22-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/digikam.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-oilpaint.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/oilpaint.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/distortionfx.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-freerotation.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/freerotation.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-blurimage.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurimage.svgz
+	$(INSTALL_DATA) $(srcdir)/hi128-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-autocorrection.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/autocorrection.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-inpainting.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inpainting.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-distortionfx.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/distortionfx.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-digitalcam.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/digitalcam.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/resize_image.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-ratiocrop.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/ratiocrop.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-restoration.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/restoration.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-depth8to16.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/depth8to16.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/slideshow.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustlevels.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-lensdistortion.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/lensdistortion.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-slideshow.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/slideshow.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-sharpenimage.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/sharpenimage.svgz
+	$(INSTALL_DATA) $(srcdir)/hi64-action-histogram.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/histogram.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-bordertool.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bordertool.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-adjusthsl.png $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjusthsl.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-channelmixer.svgz $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/channelmixer.svgz
+	$(INSTALL_DATA) $(srcdir)/hi32-action-resize_image.png $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/resize_image.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-charcoaltool.png $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/charcoaltool.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-colormanagement.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colormanagement.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-adjustlevels.png $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustlevels.png
+	$(INSTALL_DATA) $(srcdir)/hi64-action-imagecomment.png $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/imagecomment.png
+	$(INSTALL_DATA) $(srcdir)/hi128-action-adjustrgb.png $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustrgb.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
 	$(INSTALL_DATA) $(srcdir)/hi64-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/digikam.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+	$(INSTALL_DATA) $(srcdir)/hi22-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/digikam.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/hi48-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/digikam.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+	$(INSTALL_DATA) $(srcdir)/hi16-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/digikam.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 	$(INSTALL_DATA) $(srcdir)/hi128-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/digikam.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 	$(INSTALL_DATA) $(srcdir)/hi32-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/digikam.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/hi16-app-digikam.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/digikam.png
 
 uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/sharpenimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/addimagefolder.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustrgb.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/channelmixer.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/mirror.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/slideshow.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldercomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/depth16to8.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/contrast.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldercomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/importfolders2albums.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/texture.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bordertool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/whitebalance.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/noisereduction.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/freerotation.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/antivignetting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/contrast.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bwtonal.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/crop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/sharpenimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/raindrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/viewimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bwtonal.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/autocorrection.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/hotpixels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/exifinfo.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/noisereduction.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/hotpixels.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustrgb.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/autocorrection.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldernew.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/fileopen.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/shear.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/digitalcam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/editimage.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldernew.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/apps/digikam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/noisereduction.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bordertool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/perspective.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/restoration.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/texture.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/freerotation.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/infrared.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/imagecomment.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/perspective.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/histogram.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/hotpixels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/superimpose.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/filmgrain.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/superimpose.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/inserttext.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inpainting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/contrast.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/depth16to8.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/bordertool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/antivignetting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/charcoaltool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/perspective.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustlevels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/embosstool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/editimage.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/blurimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/antivignetting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inserttext.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustlevels.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/hotpixels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/importfolders2albums.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/filmgrain.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/fileopen.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/infrared.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/ratiocrop.svgz
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjusthsl.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/addimagefolder.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/exifinfo.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/apps/digikam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inpainting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth8to16.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/depth8to16.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustcurves.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldernew.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/channelmixer.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colormanagement.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/texture.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/imagecomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/antivignetting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bordertool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inserttext.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/apps/digikam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/superimpose.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/whitebalance.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/superimpose.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/channelmixer.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/contrast.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/resize_image.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/importfolders2albums.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/viewimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/addimagefolder.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colormanagement.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/embosstool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustcurves.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/sharpenimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/flip.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/blurfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/viewimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inpainting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/resize_image.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/slideshow.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/invertimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/hotpixels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inserttext.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colorfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/whitebalance.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/superimpose.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldernew.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bwtonal.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/exifinfo.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/superimpose.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/viewimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/autocorrection.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/texture.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/redeyes.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/infrared.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inpainting.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/digitalcam.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/redeyes.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bwtonal.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/filmgrain.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/invertimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth8to16.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/charcoaltool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/restoration.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/raindrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/contrast.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttableadd.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/digitalcam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/editimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/freerotation.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/flip.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/redeyes.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/shear.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/hotpixels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/invertimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/antivignetting.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colorfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/channelmixer.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/digitalcam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustcurves.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/whitebalance.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/fileopen.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/texture.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/histogram.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/blurfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/noisereduction.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/editimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colorfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colorfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/filmgrain.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/exifinfo.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/lensdistortion.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/viewimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/redeyes.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustcurves.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/infrared.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/channelmixer.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/imagecomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/infrared.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/noisereduction.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/antivignetting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/ratiocrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colormanagement.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/shear.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/rotate_cw.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/mirror.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/lensdistortion.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/apps/digikam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustcurves.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/antivignetting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustcurves.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colormanagement.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjusthsl.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bwtonal.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldercomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/freerotation.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/filmgrain.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/crop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/albumfoldernew.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/sharpenimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/charcoaltool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/flip.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/crop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/lensdistortion.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/exifinfo.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/apps/digikam.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/blurfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/infrared.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/mirror.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colorfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inserttext.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/redeyes.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/shear.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/filmgrain.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/perspective.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/whitebalance.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth8to16.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurimage.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/exifinfo.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/mirror.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/distortionfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/embosstool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/infrared.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurfx.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/viewimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/whitebalance.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/crop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/resize_image.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjusthsl.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/shear.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/whitebalance.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colorfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/digitalcam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/imagecomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/shear.svgz
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/addimagefolder.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/importfolders2albums.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/imagecomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/digitalcam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustrgb.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/superimpose.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/raindrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/noisereduction.svgz
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/invertimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/exifinfo.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/raindrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/channelmixer.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldernew.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/blurfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/addimagefolder.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inserttext.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colormanagement.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/autocorrection.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/ratiocrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/distortionfx.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/charcoaltool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inpainting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/crop.svgz
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/raindrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inserttext.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/perspective.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/histogram.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/editimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/slideshow.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/whitebalance.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/hotpixels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/texture.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustcurves.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/albumfoldercomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/perspective.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/invertimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/ratiocrop.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/restoration.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/texture.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/colormanagement.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/importfolders2albums.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/antivignetting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/filmgrain.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inserttext.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/infrared.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/exifinfo.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/raindrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/whitebalance.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/shear.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/embosstool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/channelmixer.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/inpainting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth16to8.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/imagecomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/restoration.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/viewimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/perspective.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/charcoaltool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/histogram.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurfx.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/slideshow.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/fileopen.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/perspective.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/editimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustrgb.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/antivignetting.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/crop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/flip.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustlevels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/slideshow.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inserttext.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/invertimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/apps/digikam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/imagecomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/addimagefolder.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/redeyes.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/digitalcam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/freerotation.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/whitebalance.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/raindrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/oilpaint.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/blurfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/hotpixels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/invertimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/resize_image.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/fileopen.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/resize_image.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/channelmixer.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bwtonal.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/texture.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/embosstool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/autocorrection.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/exifinfo.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/antivignetting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth8to16.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjusthsl.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/ratiocrop.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/contrast.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustcurves.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/digitalcam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustrgb.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colorfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/sharpenimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/filmgrain.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/whitebalance.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurfx.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/importfolders2albums.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/crop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inserttext.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldercomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/inpainting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldernew.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/embosstool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/blurfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/autocorrection.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/histogram.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/exifinfo.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/slideshow.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/imagecomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/whitebalance.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/viewimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/sharpenimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inserttext.svgz
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/ratiocrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/noisereduction.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colorfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/editimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/exifinfo.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bwtonal.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/apps/digikam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/autocorrection.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/restoration.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/fileopen.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/filmgrain.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/infrared.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/invertimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/distortionfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/superimpose.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/contrast.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/filmgrain.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/colorfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/resize_image.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/embosstool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/contrast.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldercomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/superimpose.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustcurves.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/distortionfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/oilpaint.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inpainting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/freerotation.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth16to8.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjusthsl.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth8to16.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/addimagefolder.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/filmgrain.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps/digikam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/resize_image.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttableadd.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldercomment.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/embosstool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/exifinfo.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/lensdistortion.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjusthsl.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/shear.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldernew.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/digitalcam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/mirror.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/oilpaint.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustlevels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps/digikamimageplugins.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/noisereduction.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/superimpose.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustcurves.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/embosstool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldernew.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/fileopen.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bordertool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/whitebalance.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/importfolders2albums.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/depth8to16.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/bwtonal.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldercomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/distortionfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/imagecomment.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/rotate_cw.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/lensdistortion.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/viewimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/shear.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/restoration.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/noisereduction.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/slideshow.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustcurves.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/redeyes.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/albumfoldercomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/perspective.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/histogram.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth16to8.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/invertimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/exifinfo.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustcurves.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/importfolders2albums.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldernew.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/crop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/crop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/superimpose.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/editimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth16to8.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/invertimage.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth16to8.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bwtonal.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/editimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttable.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/slideshow.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/shear.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/addimagefolder.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/autocorrection.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/filmgrain.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/channelmixer.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colormanagement.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/lensdistortion.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/texture.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/depth8to16.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/redeyes.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/perspective.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colorfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/contrast.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/lensdistortion.png
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/fileopen.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/addimagefolder.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/apps/digikam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/addimagefolder.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/autocorrection.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/bordertool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustlevels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/shear.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustrgb.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldernew.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/filmgrain.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth16to8.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/histogram.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/oilpaint.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/apps/digikam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/perspective.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/channelmixer.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/importfolders2albums.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/filmgrain.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/sharpenimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/colormanagement.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/channelmixer.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/infrared.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/fileopen.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/redeyes.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/sharpenimage.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/inpainting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/resize_image.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/noisereduction.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bordertool.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/antivignetting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/importfolders2albums.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjusthsl.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/64x64/actions/crop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/resize_image.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustcurves.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/flip.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/digikamimageplugins.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/bordertool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/depth8to16.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/restoration.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/histogram.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/texture.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/rotate_cw.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps/digikam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/importfolders2albums.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/albumfoldercomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/antivignetting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/sharpenimage.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/oilpaint.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/importfolders2albums.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colorfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/32x32/actions/rotate_cw.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/slideshow.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/infrared.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/ratiocrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/contrast.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/distortionfx.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/depth8to16.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/superimpose.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/flip.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/imagecomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustlevels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/freerotation.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/charcoaltool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustrgb.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/charcoaltool.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/blurimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/raindrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/mirror.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/histogram.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bordertool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/redeyes.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustlevels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/charcoaltool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colormanagement.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inserttext.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inpainting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/albumfoldernew.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/noisereduction.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/apps/digikam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/fileopen.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/antivignetting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/mirror.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustlevels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/resize_image.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/blurimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/resize_image.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bwtonal.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bwtonal.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/editimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/charcoaltool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/embosstool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/shear.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/noisereduction.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lensdistortion.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/oilpaint.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/superimpose.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/charcoaltool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/shear.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/crop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/bordertool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/depth16to8.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/perspective.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/albumfoldercomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/freerotation.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/raindrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bwtonal.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/fileopen.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/flip.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/oilpaint.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colorfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/invertimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/albumfoldernew.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/sharpenimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/freerotation.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/albumfoldercomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lighttable.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/antivignetting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/inserttext.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/depth16to8.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/importfolders2albums.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/viewimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/hotpixels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/viewimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/bordertool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/embosstool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldernew.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/autocorrection.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/sharpenimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/scalable/actions/crop.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/editimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/hotpixels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bwtonal.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/sharpenimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/autocorrection.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/noisereduction.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/apps/digikamimageplugins.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/histogram.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/texture.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/charcoaltool.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustrgb.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/whitebalance.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/histogram.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/flip.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/redeyes.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/texture.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/autocorrection.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/addimagefolder.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/slideshow.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustlevels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/hotpixels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/blurfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/contrast.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth16to8.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/infrared.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/freerotation.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/bordertool.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/22x22/actions/fileopen.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/albumfoldercomment.svgz
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/restoration.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/blurimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/invertimage.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/raindrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustcurves.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/imagecomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/perspective.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/viewimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustrgb.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/fileopen.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/ratiocrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/colormanagement.svgz
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/editimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/adjustlevels.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/ratiocrop.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/shear.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/restoration.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/addimagefolder.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/depth8to16.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/lensdistortion.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjustlevels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/histogram.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustlevels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/depth8to16.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/blurfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/importfolders2albums.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/resize_image.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/freerotation.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/hotpixels.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/contrast.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/digitalcam.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/inpainting.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/contrast.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/albumfoldercomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/inserttext.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/imagecomment.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/oilpaint.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/sharpenimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/hotpixels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/imagecomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/oilpaint.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/texture.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/depth8to16.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/colormanagement.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/ratiocrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/superimpose.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/ratiocrop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/bordertool.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/adjustrgb.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/mirror.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/freerotation.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/adjustrgb.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/restoration.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/16x16/actions/crop.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/inpainting.svgz
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/lensdistortion.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/48x48/actions/crop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjusthsl.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/addimagefolder.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/depth16to8.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/noisereduction.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjusthsl.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/colormanagement.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/digitalcam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/editimage.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/oilpaint.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/lensdistortion.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/restoration.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/channelmixer.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustrgb.png
 	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/blurimage.png
-	-rm -f $(DESTDIR)$(digikamicondir)/crystalsvg/128x128/actions/fileopen.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/blurfx.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/adjusthsl.png
-	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/freerotation.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/digikam.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/digikam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/oilpaint.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/freerotation.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/blurimage.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/colormanagement.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/autocorrection.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/inpainting.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/distortionfx.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/digitalcam.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/resize_image.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/ratiocrop.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/restoration.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/depth8to16.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/slideshow.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjustlevels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/lensdistortion.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/slideshow.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/sharpenimage.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/histogram.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/bordertool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/22x22/actions/adjusthsl.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/scalable/actions/channelmixer.svgz
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/32x32/actions/resize_image.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/48x48/actions/charcoaltool.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/colormanagement.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/16x16/actions/adjustlevels.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/64x64/actions/imagecomment.png
+	-rm -f $(DESTDIR)$(digikamicondir)/hicolor/128x128/actions/adjustrgb.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/digikam.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/digikam.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/digikam.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/digikam.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/digikam.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/digikam.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/digikam.png
 
 #>+ 15
 force-reedit:
--- digikam-0.9.4.orig/digikam/data/Makefile.in
+++ digikam-0.9.4/digikam/data/Makefile.in
@@ -674,6 +674,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
--- digikam-0.9.4.orig/digikam/data/about/Makefile.in
+++ digikam-0.9.4/digikam/data/about/Makefile.in
@@ -547,8 +547,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
-KDE_DIST=bar-bottom-left.png bar-top-middle.png box-bottom-middle.png bar-bottom-right.png top-left.png box-top-right.png box-top-left.png box-middle-left.png Makefile.in box-middle-right.png bar-bottom-middle.png bar-top-right.png bottom-right.png top-right-digikam.png box-bottom-left.png bottom-left.png bar-middle-right.png digikam.css main.html top-middle.png kde_infopage.css kde_infopage_rtl.css bottom-middle.png Makefile.am box-top-middle.png bar-top-left.png box-bottom-right.png bar-middle-left.png 
+KDE_DIST=bar-bottom-left.png box-bottom-middle.png bar-top-middle.png bar-bottom-right.png top-left.png box-top-right.png box-top-left.png box-middle-left.png Makefile.in box-middle-right.png bar-bottom-middle.png bottom-right.png bar-top-right.png top-right-digikam.png box-bottom-left.png bottom-left.png bar-middle-right.png digikam.css main.html top-middle.png kde_infopage.css kde_infopage_rtl.css bottom-middle.png Makefile.am box-top-middle.png bar-top-left.png box-bottom-right.png bar-middle-left.png 
 
 #>+ 2
 docs-am:
--- digikam-0.9.4.orig/digikam/data/profiles/Makefile.in
+++ digikam-0.9.4/digikam/data/profiles/Makefile.in
@@ -540,6 +540,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=adobergb.icm srgb.icm Makefile.in widegamut.icm applergb.icm prophoto.icm srgb-d65.icm Makefile.am 
 
--- digikam-0.9.4.orig/digikam/data/pics/Makefile.in
+++ digikam-0.9.4/digikam/data/pics/Makefile.in
@@ -601,8 +601,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
-KDE_DIST=indicator-red.png banner-digikam.png duplicatebothvert.png indicator-green.png zoom30.png logo-cimg.png albumfolder-new.png tag.png color-picker-black.png menusidepixmap.xcf tag-recents.png Makefile.in duplicatebothhorz.png bothhorz.png logo-lcms.png target.png curvefree.png original.png image-selection.png tag-folder.png albumfolder-importdir.png tag-assigned.png togglemouseover.png digikam-splash.xcf digikam-splash.png editimage.png tag-delete.png albumfolder-importimages.png color-picker-grey.png worldmap.jpg curvemooth.png tag-addressbook.png histogram.png zoom20.png color-picker-white.png tag-reset.png histogram-lin.png histogram-log.png centerwidth.png albumfolder-properties.png tag-people.png tag-places.png digitalcam.png underexposure.png rating.png tag-events.png zoom10.png logo-gphoto.png tag-new.png indicator-gray.png menusidepixmap.png image-full.png tag-properties.png overexposure.png centerheight.png logo-exiv2.png Makefile.am exifinfo.png bothvert.png 
+KDE_DIST=indicator-red.png banner-digikam.png duplicatebothvert.png indicator-green.png zoom30.png logo-cimg.png albumfolder-new.png tag.png color-picker-black.png menusidepixmap.xcf tag-recents.png Makefile.in duplicatebothhorz.png logo-lcms.png bothhorz.png target.png curvefree.png original.png image-selection.png tag-folder.png albumfolder-importdir.png tag-assigned.png togglemouseover.png digikam-splash.xcf digikam-splash.png editimage.png tag-delete.png albumfolder-importimages.png color-picker-grey.png worldmap.jpg curvemooth.png tag-addressbook.png histogram.png zoom20.png color-picker-white.png tag-reset.png histogram-lin.png histogram-log.png centerwidth.png albumfolder-properties.png tag-people.png tag-places.png digitalcam.png underexposure.png rating.png tag-events.png zoom10.png logo-gphoto.png tag-new.png indicator-gray.png menusidepixmap.png image-full.png tag-properties.png overexposure.png centerheight.png logo-exiv2.png exifinfo.png Makefile.am bothvert.png 
 
 #>+ 2
 docs-am:
--- digikam-0.9.4.orig/digikam/data/themes/Makefile.in
+++ digikam-0.9.4/digikam/data/themes/Makefile.in
@@ -540,6 +540,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Rose Dark OrangeCrush Makefile.in Dreary Clean Sandy Digikasa Gray DLR Blue Marine Dessert Makefile.am 
 
--- digikam-0.9.4.orig/Makefile.in
+++ digikam-0.9.4/Makefile.in
@@ -949,8 +949,52 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+clean-bcheck: 
+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
+
+bcheck: bcheck-recursive
+
+bcheck-am:
+	@for i in ; do \
+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+	        echo "$$i"; \
+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+	            rm -f $$i.bchecktest.cc; exit 1; \
+	        fi ; \
+	        echo "" >> $$i.bchecktest.cc.class; \
+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
+	        rm -f a.out; \
+	    fi ; \
+	done
+
+
+
+clean-bcheck: 
+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
+
+bcheck: bcheck-recursive
+
+bcheck-am:
+	@for i in ; do \
+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+	        echo "$$i"; \
+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+	            rm -f $$i.bchecktest.cc; exit 1; \
+	        fi ; \
+	        echo "" >> $$i.bchecktest.cc.class; \
+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
+	        rm -f a.out; \
+	    fi ; \
+	done
+
+
+
 #>+ 2
-KDE_DIST=Mainpage.dox digikam.lsm subdirs configure.in.bot Makefile.in RELEASE.rev configure.files config.h.in Makefile.am.in.wo configure.in Makefile.cvs HACKING aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am Makefile.am.in 
+KDE_DIST=Mainpage.dox digikam.lsm subdirs configure.in.bot Makefile.in configure.files RELEASE.rev config.h.in configure.in Makefile.cvs HACKING aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in 
 
 #>+ 2
 docs-am:
--- digikam-0.9.4.orig/config.h.in
+++ digikam-0.9.4/config.h.in
@@ -144,13 +144,9 @@
 /* Defined if compiling without arts */
 #undef WITHOUT_ARTS
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-#elif ! defined __LITTLE_ENDIAN__
-# undef WORDS_BIGENDIAN
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
 /*
  * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system