[Pkg-kde-commits] rev 2227 - trunk/packages/kdemultimedia/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Nov 12 20:55:45 UTC 2005


Author: chrsmrtn
Date: 2005-11-12 20:55:38 +0000 (Sat, 12 Nov 2005)
New Revision: 2227

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


Modified: trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff	2005-11-12 20:53:13 UTC (rev 2226)
+++ trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff	2005-11-12 20:55:38 UTC (rev 2227)
@@ -2,7 +2,7 @@
 # vi: ft=diff
 --- acinclude.m4
 +++ acinclude.m4
-@@ -1688,15 +1688,6 @@
+@@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -18,7 +18,7 @@
    fi
    AC_SUBST(KDE_USE_CLOSURE_TRUE)
    AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2138,9 +2129,6 @@
+@@ -2144,9 +2135,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28,10 +28,33 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -3288,39 +3276,39 @@
+@@ -3351,63 +3339,63 @@
  
-   if test "x$GXX" = "xyes"; then
-     kde_have_gcc_visibility=no
+ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
+ [
+-  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+-  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+-  if test "x$GXX" = "xyes"; then
+-    AC_LANG_SAVE
+-    AC_LANG_CPLUSPLUS
+-    AC_EGREP_CPP(
+-       [GCC visibility push],
+-       [ #include <exception> 
+-       ], 
+-    [
+-      AC_MSG_RESULT(yes)
+-      kde_stdc_visibility_patched=yes ],
+-    [ 
+-      AC_MSG_RESULT(no)
+-      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
+-                   visibility support. Disabling -fvisibility=hidden])
+-
+-      kde_stdc_visibility_patched=no ])
+-    AC_LANG_RESTORE
+-
+-    kde_have_gcc_visibility=no
 -    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
 -    [
 -      kde_have_gcc_visibility=yes
@@ -58,13 +81,37 @@
 -        ]
 -      )
 -
--      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+-      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
 -        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 -        KDE_CHECK_VISIBILITY_GCC_BUG
 -        HAVE_GCC_VISIBILITY=1
 -        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
 -      fi
 -    ])
+-  fi
++dnl  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
++dnl
++dnl  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
++dnl
++dnl  if test "x$GXX" = "xyes"; then
++dnl    AC_LANG_SAVE
++dnl    AC_LANG_CPLUSPLUS
++dnl    AC_EGREP_CPP(
++dnl       [GCC visibility push],
++dnl       [ #include <exception> 
++dnl       ], 
++dnl    [
++dnl      AC_MSG_RESULT(yes)
++dnl      kde_stdc_visibility_patched=yes ],
++dnl    [ 
++dnl      AC_MSG_RESULT(no)
++dnl      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
++dnl                   visibility support. Disabling -fvisibility=hidden])
++dnl
++dnl      kde_stdc_visibility_patched=no ])
++dnl    AC_LANG_RESTORE
++dnl
++dnl    kde_have_gcc_visibility=no
 +dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
 +dnl    [
 +dnl      kde_have_gcc_visibility=yes
@@ -78,11 +125,11 @@
 +dnl
 +dnl          AC_TRY_COMPILE(
 +dnl          [
-+dnl #include <qglobal.h>
-+dnl #if Q_EXPORT - 0 != 0
-+dnl /* if this compiles, then Q_EXPORT is undefined */
-+dnl /* if Q_EXPORT is nonempty, this will break compilation */
-+dnl #endif
++dnl#include <qglobal.h>
++dnl#if Q_EXPORT - 0 != 0
++dnl/* if this compiles, then Q_EXPORT is undefined */
++dnl/* if Q_EXPORT is nonempty, this will break compilation */
++dnl#endif
 +dnl          ], [/* elvis is alive */],
 +dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
 +dnl
@@ -91,25 +138,54 @@
 +dnl        ]
 +dnl      )
 +dnl
-+dnl      if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
 +dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 +dnl        KDE_CHECK_VISIBILITY_GCC_BUG
 +dnl        HAVE_GCC_VISIBILITY=1
 +dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
 +dnl      fi
 +dnl    ])
++dnl  fi
+ ])
+ 
+ AC_DEFUN([KDE_ADD_DEPENDENCIES],
+@@ -5907,30 +5895,15 @@
    fi
  ])
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
  
-@@ -5795,6 +5783,7 @@
- ## the same distribution terms that you use for the rest of that program.
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
  
- # serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
  
- 
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5854,7 +5843,7 @@
+@@ -5990,7 +5963,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -118,9 +194,107 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6268,12 +6257,11 @@
+@@ -6040,7 +6013,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+@@ -6060,7 +6033,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -6108,6 +6081,8 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -6153,6 +6128,48 @@
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -6225,15 +6242,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -6402,14 +6419,13 @@
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
-     case "`/usr/bin/file conftest.o`" in
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
      *32-bit*)
 -      LINUX_64_MODE="32"
        case $host in
@@ -132,7 +306,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6285,7 +6273,6 @@
+@@ -6421,7 +6437,6 @@
        esac
        ;;
      *64-bit*)
@@ -140,7 +314,47 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6415,7 +6402,7 @@
+@@ -6486,7 +6501,7 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6496,8 +6511,10 @@
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        $2=yes
+      fi
+    fi
+@@ -6523,11 +6540,16 @@
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
+      else
+        $2=yes
+      fi
+@@ -6551,7 +6573,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -149,24 +363,52 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6444,20 +6431,26 @@
+@@ -6580,20 +6602,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-  *)
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
 -    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
 -	       = "XX$testring") >/dev/null 2>&1 &&
 -	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-+    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
  	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -181,7 +423,16 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6607,7 +6600,7 @@
+@@ -6689,7 +6744,7 @@
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+@@ -6743,7 +6798,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -190,7 +441,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6696,13 +6689,6 @@
+@@ -6832,20 +6887,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -204,12 +455,29 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -6726,8 +6712,11 @@
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -6857,13 +6905,18 @@
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -218,7 +486,18 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6844,7 +6833,7 @@
+@@ -6922,8 +6975,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -6980,7 +7033,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -227,7 +506,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6857,7 +6846,7 @@
+@@ -6993,7 +7046,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -236,7 +515,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6867,7 +6856,20 @@
+@@ -7003,7 +7056,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -258,7 +537,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6932,7 +6934,7 @@
+@@ -7068,7 +7134,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -267,8 +546,17 @@
    ;;
  
  beos*)
-@@ -6957,7 +6959,7 @@
+@@ -7077,7 +7143,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7093,7 +7159,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -276,34 +564,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7022,7 +7024,7 @@
+@@ -7105,7 +7171,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -7135,7 +7202,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -7158,7 +7225,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7045,7 +7047,7 @@
+@@ -7181,7 +7248,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7105,7 +7107,7 @@
+@@ -7193,8 +7260,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -7212,7 +7288,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -7239,9 +7315,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7120,7 +7122,7 @@
+@@ -7256,7 +7332,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -312,7 +651,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7131,7 +7133,7 @@
+@@ -7267,7 +7343,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -321,7 +660,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7193,22 +7195,19 @@
+@@ -7329,22 +7405,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -343,14 +682,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7218,6 +7217,30 @@
+@@ -7354,6 +7427,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -381,7 +720,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7227,7 +7250,7 @@
+@@ -7363,7 +7460,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -390,16 +729,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7256,7 +7279,7 @@
+@@ -7392,7 +7489,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7276,7 +7299,7 @@
+@@ -7412,7 +7513,7 @@
  
  os2*)
    libname_spec='$name'
@@ -408,9 +751,80 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7867,31 +7890,23 @@
+@@ -7558,7 +7659,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+@@ -7620,7 +7723,7 @@
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -7794,7 +7897,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -7904,7 +8007,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -7936,7 +8039,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -7963,6 +8066,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+@@ -7996,44 +8108,36 @@
+   lt_cv_deplibs_check_method=pass_all
    ;;
  
+-bsdi4*)
++bsdi[[45]]*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
  cygwin*)
 -  lt_cv_deplibs_check_method=pass_all
 +  # func_win32_libid is a shell function defined in ltmain.sh
@@ -444,12 +858,28 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7930,42 +7945,21 @@
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -8049,7 +8153,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -8066,42 +8170,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -499,9 +929,21 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -7994,9 +7988,6 @@
+@@ -8120,19 +8203,14 @@
    ;;
  
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+   ;;
+ 
  osf3* | osf4* | osf5*)
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -509,7 +951,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8006,7 +7997,6 @@
+@@ -8142,7 +8220,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -517,7 +959,83 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8272,7 +8262,7 @@
+@@ -8250,13 +8327,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+@@ -8275,13 +8352,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -8319,10 +8396,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -8395,6 +8483,10 @@
+ 
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -8408,7 +8500,7 @@
  fi
  if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
    AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -526,7 +1044,16 @@
    else
      AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
      _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8322,7 +8312,7 @@
+@@ -8449,7 +8541,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -8458,48 +8550,11 @@
    fi
    ;;
  
@@ -535,62 +1062,87 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -8332,29 +8322,29 @@
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case "$host_os" in
-     rhapsody* | darwin1.[[012]])
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-       else
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.[012])
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-       fi
-       ;;
-     esac
-     output_verbose_link_cmd='echo'
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
 -    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
 -    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
 -    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     _LT_AC_TAGVAR(hardcode_direct, $1)=no
-     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8362,8 +8352,8 @@
-     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-   else
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -  fi  
 -    ;;  
-+  fi
 +    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8471,8 +8461,8 @@
+@@ -8524,7 +8579,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -8553,7 +8608,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -8568,6 +8623,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -8589,7 +8648,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -8607,8 +8666,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -601,7 +1153,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8498,7 +8488,7 @@
+@@ -8634,7 +8693,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -610,7 +1162,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8528,8 +8518,22 @@
+@@ -8664,8 +8723,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -635,7 +1187,26 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8575,15 +8579,16 @@
+@@ -8682,7 +8755,7 @@
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -8703,6 +8776,9 @@
+ 	fi
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -8711,15 +8787,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -656,7 +1227,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -8592,13 +8597,12 @@
+@@ -8728,13 +8805,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -672,16 +1243,23 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8613,7 +8617,7 @@
+@@ -8748,8 +8824,8 @@
+ 	# Exported symbols can be pulled into shared objects from archives
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	# This is similar to how AIX traditionally builds it's shared libraries.
+-	# This is similar to how AIX traditionally builds it's shared libraries.
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	# This is similar to how AIX traditionally builds its shared libraries.
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
        fi
      fi
      ;;
-@@ -8630,12 +8634,12 @@
+@@ -8762,16 +8838,17 @@
+     esac
+     ;;
+ 
++
+   cygwin* | mingw* | pw32*)
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -696,7 +1274,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8644,7 +8648,7 @@
+@@ -8780,70 +8857,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -705,87 +1283,170 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -8655,20 +8659,20 @@
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     case "$host_os" in
-     rhapsody* | darwin1.[[012]])
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
 -      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-       else
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.[012])
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
        fi
-       ;;
-     esac
-@@ -8678,19 +8682,19 @@
-       lt_int_apple_cc_single_mod=yes
-     fi
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     else
+-    else
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     fi
+-    fi
 -    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- 
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
+-    else
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
+-    fi
 -    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     _LT_AC_TAGVAR(hardcode_direct, $1)=no
-     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8725,7 +8729,7 @@
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-  fi
+-    ;;
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -8854,14 +8942,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
++  freebsd[[12]]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
--  freebsd*)
-+  freebsd* | kfreebsd*-gnu)
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8747,7 +8751,7 @@
+@@ -8878,12 +8966,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
-     aCC)
+-    aCC)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8756,11 +8760,11 @@
+@@ -8892,11 +8980,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
 -      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
      *)
        if test "$GXX" = yes; then
@@ -794,7 +1455,38 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8817,7 +8821,7 @@
+@@ -8906,7 +8994,7 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -8922,7 +9010,7 @@
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
++    case $host_cpu in
+     hppa*64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -8943,17 +9031,17 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
+ 	hppa*64*|ia64*)
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -803,7 +1495,13 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8838,7 +8842,7 @@
+@@ -8969,12 +9057,12 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    ia64*|hppa*64*)
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -812,28 +1510,38 @@
  	      ;;
  	    esac
  	  fi
-@@ -8853,7 +8857,7 @@
+@@ -8987,9 +9075,9 @@
+     ;;
+   irix5* | irix6*)
      case $cc_basename in
-       CC)
+-      CC)
++      CC*)
  	# SGI C++
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8864,9 +8868,9 @@
+@@ -9000,9 +9088,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  	  else
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8883,8 +8887,8 @@
+@@ -9013,14 +9101,14 @@
+     ;;
+   linux*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -844,19 +1552,49 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8906,16 +8910,16 @@
+@@ -9038,20 +9126,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
  	# Intel C++
  	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
-       cxx)
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
  	# Compaq C++
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -865,8 +1603,17 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8953,7 +8957,7 @@
+@@ -9079,7 +9191,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
+@@ -9089,7 +9201,7 @@
+ 	;;
      esac
      ;;
 -  netbsd*)
@@ -874,7 +1621,32 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -8972,7 +8976,7 @@
+@@ -9100,15 +9212,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -883,25 +1655,41 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8989,7 +8993,7 @@
+@@ -9118,14 +9246,14 @@
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9143,7 +9271,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9032,7 +9036,7 @@
+@@ -9162,13 +9290,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -910,50 +1698,123 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9048,10 +9052,10 @@
+@@ -9177,17 +9305,17 @@
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      cxx)
++      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
  	  echo "-hidden">> $lib.exp~
 -	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9070,7 +9074,7 @@
+@@ -9206,7 +9334,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 -	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9127,9 +9131,9 @@
-       CC)
+@@ -9230,7 +9358,7 @@
+   sco*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+@@ -9242,12 +9370,12 @@
+     ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9260,36 +9388,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
  	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9163,7 +9167,7 @@
+ 	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -9297,9 +9422,9 @@
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
-       gcx)
+-      gcx)
++      gcx*)
  	# Green Hills C++ Compiler
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9173,9 +9177,9 @@
+@@ -9309,9 +9434,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -965,7 +1826,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9184,9 +9188,9 @@
+@@ -9320,9 +9445,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -977,7 +1838,25 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9354,7 +9358,7 @@
+@@ -9340,7 +9465,7 @@
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -9450,7 +9575,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -9490,7 +9615,7 @@
         fi
         ;;
  
@@ -986,16 +1865,115 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9463,7 +9467,7 @@
+@@ -9526,6 +9651,21 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++    ;;
++  esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -9576,12 +9716,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -9591,7 +9735,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -9599,8 +9743,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
 -aix4*)
+-  test "$enable_shared" = yes && enable_static=no
 +aix4* | aix5*)
-   test "$enable_shared" = yes && enable_static=no
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
    ;;
  esac
-@@ -9605,11 +9609,12 @@
+ AC_MSG_RESULT([$enable_shared])
+@@ -9651,20 +9797,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -9711,11 +9864,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+@@ -9741,11 +9899,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1010,7 +1988,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9659,7 +9664,7 @@
+@@ -9795,7 +9954,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1019,7 +1997,34 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9790,7 +9795,7 @@
+@@ -9861,11 +10020,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -9896,6 +10055,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -9926,7 +10091,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1028,7 +2033,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9821,7 +9826,7 @@
+@@ -9957,7 +10122,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1037,7 +2042,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10065,7 +10070,10 @@
+@@ -9972,7 +10137,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -10201,7 +10366,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -1049,7 +2063,31 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10138,7 +10146,7 @@
+@@ -10243,9 +10411,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -10267,6 +10432,13 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+@@ -10274,7 +10446,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -1058,7 +2096,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10156,7 +10164,7 @@
+@@ -10292,14 +10464,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1067,26 +2105,133 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -10371,7 +10379,7 @@
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -10463,7 +10638,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -10488,18 +10663,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -10507,22 +10692,22 @@
+ 	    ;;
  	esac
  	;;
--      freebsd*)
-+      freebsd* | kfreebsd*-gnu)
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -10422,7 +10430,7 @@
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+-	  aCC)
++	  aCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -10537,7 +10722,7 @@
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -10548,18 +10733,24 @@
+ 	;;
+       linux*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 -	    ;; 
+-	  cxx)
 +	    ;;
- 	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10447,7 +10455,7 @@
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -10576,25 +10767,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
  	    ;;
+ 	  *)
+ 	    ;;
  	esac
  	;;
 -      netbsd*)
@@ -1094,17 +2239,175 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -10758,6 +10766,9 @@
+-	  KCC)
++	  KCC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -10610,7 +10801,7 @@
+ 	;;
+       sco*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  *)
+@@ -10619,13 +10810,13 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+@@ -10635,12 +10826,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+@@ -10650,7 +10841,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+@@ -10721,7 +10912,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -10747,6 +10938,16 @@
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -10758,7 +10959,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -10782,12 +10983,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
+       ccc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+@@ -10808,9 +11016,14 @@
+       ;;
+ 
+     solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -10832,6 +11045,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10859,7 +11077,7 @@
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -10892,7 +11110,10 @@
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
    cygwin* | mingw*)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
 +  linux*)
 +    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
+   ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -10782,7 +10793,7 @@
+@@ -10918,7 +11139,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1113,7 +2416,45 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10856,7 +10867,7 @@
+@@ -10935,7 +11156,8 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+-
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -10955,6 +11177,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -10992,7 +11235,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -1122,7 +2463,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10866,13 +10877,13 @@
+@@ -11002,13 +11245,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1130,7 +2471,8 @@
 +      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
        _LT_AC_TAGVAR(always_export_symbols, $1)=no
        _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -1138,18 +2480,51 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10881,19 +10892,19 @@
+@@ -11017,19 +11260,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
        else
- 	ld_shlibs=no
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
  
 -    netbsd*)
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -1162,7 +2537,7 @@
        fi
        ;;
  
-@@ -10911,8 +10922,8 @@
+@@ -11047,8 +11322,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1173,36 +2548,8 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10925,10 +10936,36 @@
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
+@@ -11063,24 +11338,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-+      fi
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+    ;;
-+
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -1212,7 +2559,28 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10978,9 +11015,20 @@
+       ;;
+     esac
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-      fi
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -11114,9 +11384,20 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -1235,7 +2603,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11026,29 +11074,29 @@
+@@ -11133,7 +11414,7 @@
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -11154,6 +11435,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -11162,29 +11446,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1274,16 +2661,27 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11063,7 +11111,7 @@
+@@ -11198,8 +11482,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
 -	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
  	fi
        fi
        ;;
-@@ -11086,13 +11134,13 @@
+@@ -11212,7 +11496,7 @@
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[[45]]*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+@@ -11222,69 +11506,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1300,88 +2698,117 @@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
-@@ -11106,21 +11154,21 @@
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       case "$host_os" in
-       rhapsody* | darwin1.[[012]])
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
 -	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.[012])
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	      ;;
 -	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[[012]])
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -11129,26 +11177,26 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 -    else  
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi  
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi  
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
 +    fi
        ;;
  
      dgux*)
-@@ -11181,8 +11229,8 @@
+@@ -11317,8 +11601,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11190,7 +11238,7 @@
+@@ -11326,7 +11610,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1390,9 +2817,12 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11208,10 +11256,10 @@
+@@ -11342,16 +11626,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	case $host_cpu in
  	hppa*64*|ia64*)
 -	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1403,7 +2833,21 @@
  	  ;;
  	esac
        else
-@@ -11258,7 +11306,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -11361,7 +11645,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -11394,7 +11678,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1412,7 +2856,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11268,7 +11316,7 @@
+@@ -11404,7 +11688,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1421,16 +2865,17 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11291,7 +11339,7 @@
+@@ -11427,7 +11711,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11301,7 +11349,7 @@
+@@ -11437,7 +11722,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1439,7 +2884,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11312,14 +11360,14 @@
+@@ -11448,14 +11733,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1456,7 +2901,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11331,7 +11379,7 @@
+@@ -11467,13 +11752,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1465,19 +2910,50 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11356,9 +11404,9 @@
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -11492,10 +11777,12 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11378,7 +11426,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -11504,8 +11791,18 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+@@ -11514,7 +11811,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -1486,7 +2962,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11438,9 +11486,9 @@
+@@ -11574,9 +11871,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1498,7 +2974,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11498,7 +11546,7 @@
+@@ -11634,7 +11931,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1507,16 +2983,15 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11657,8 +11705,8 @@
-     fi
-   done
- done
--])
- SED=$lt_cv_path_SED
-+])
- AC_MSG_RESULT([$SED])
- ])
- 
+@@ -11768,7 +12065,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 --- aclocal.m4
 +++ aclocal.m4
 @@ -522,6 +522,35 @@
@@ -1555,19 +3030,19 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
---- akode/arts_plugin/Makefile.in
-+++ akode/arts_plugin/Makefile.in
-@@ -259,6 +259,9 @@
+--- akode_artsplugin/Makefile.in
++++ akode_artsplugin/Makefile.in
+@@ -253,6 +253,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -496,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -1576,7 +3051,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -534,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1588,466 +3063,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -897,7 +900,7 @@
+@@ -873,7 +876,7 @@
  
  
  #>+ 2
--KDE_DIST=akodeXiphPlayObject_impl.h Makefile.in akodeMPCPlayObject_impl.h akodeSpeexStreamPlayObject_impl.h akodearts.idl arts_inputstream.h akodePlayObject.mcopclass akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h 
-+KDE_DIST=akodeXiphPlayObject_impl.h akodeMPCPlayObject_impl.h Makefile.in akodearts.idl akodeSpeexStreamPlayObject_impl.h akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h 
+-KDE_DIST=akodeXiphPlayObject_impl.h Makefile.in akodeMPCPlayObject_impl.h akodeSpeexStreamPlayObject_impl.h akodearts.idl arts_inputstream.h akodePlayObject.mcopclass akodeMPEGPlayObject_impl.h akodeFFMPEGPlayObject_impl.h configure.in.in Makefile.am akodeVorbisStreamPlayObject_impl.h 
++KDE_DIST=akodeXiphPlayObject_impl.h akodeMPCPlayObject_impl.h Makefile.in akodearts.idl akodeSpeexStreamPlayObject_impl.h akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h configure.in.in akodeFFMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h 
  
  #>+ 3
  clean-closures:
---- akode/lib/Makefile.in
-+++ akode/lib/Makefile.in
-@@ -262,6 +262,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/Makefile.in
-+++ akode/Makefile.in
-@@ -217,6 +217,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- akode/plugins/alsa_sink/Makefile.in
-+++ akode/plugins/alsa_sink/Makefile.in
-@@ -241,6 +241,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/plugins/jack_sink/Makefile.in
-+++ akode/plugins/jack_sink/Makefile.in
-@@ -241,6 +241,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/plugins/Makefile.in
-+++ akode/plugins/Makefile.in
-@@ -218,6 +218,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- akode/plugins/mpc_decoder/Makefile.in
-+++ akode/plugins/mpc_decoder/Makefile.in
-@@ -258,6 +258,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/plugins/mpc_decoder/mppdec/Makefile.in
-+++ akode/plugins/mpc_decoder/mppdec/Makefile.in
-@@ -233,6 +233,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -526,9 +529,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
---- akode/plugins/mpeg_decoder/Makefile.in
-+++ akode/plugins/mpeg_decoder/Makefile.in
-@@ -245,6 +245,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -541,9 +544,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/plugins/oss_sink/Makefile.in
-+++ akode/plugins/oss_sink/Makefile.in
-@@ -241,6 +241,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/plugins/polyp_sink/Makefile.in
-+++ akode/plugins/polyp_sink/Makefile.in
-@@ -241,6 +241,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/plugins/src_resampler/Makefile.in
-+++ akode/plugins/src_resampler/Makefile.in
-@@ -242,6 +242,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -536,9 +539,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- akode/plugins/xiph_decoder/Makefile.in
-+++ akode/plugins/xiph_decoder/Makefile.in
-@@ -252,6 +252,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -838,7 +841,7 @@
- 
- 
- #>+ 2
--KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in xiph_decoder.h vorbis_decoder.h flac_decoder.h Makefile.am speex_decoder.h 
-+KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in vorbis_decoder.h xiph_decoder.h flac_decoder.h Makefile.am speex_decoder.h 
- 
- #>+ 3
- clean-closures:
---- akode/test/Makefile.in
-+++ akode/test/Makefile.in
-@@ -234,6 +234,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -526,9 +529,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
 --- arts/builder/Makefile.in
 +++ arts/builder/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -274,6 +274,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -530,7 +533,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2056,7 +3093,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -568,9 +571,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2068,28 +3105,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1100,7 +1103,7 @@
+@@ -1071,7 +1074,7 @@
  	-rm -f  qttableview.moc interfacedlg.moc mwidget.moc portposdlg.moc main.moc execdlg.moc retrievedlg.moc propertypanel.moc menumaker.moc
  
  #>+ 2
--KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h drawutils.h portposdlg.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h createtool.h scomponent.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h 
-+KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h portposdlg.h drawutils.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h createtool.h scomponent.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h 
+-KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h drawutils.h portposdlg.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h scomponent.h createtool.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h 
++KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h portposdlg.h drawutils.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h scomponent.h createtool.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h 
  
  #>+ 4
  clean-ui:
 --- arts/builder/pics/Makefile.in
 +++ arts/builder/pics/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -217,6 +217,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -452,7 +455,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -2098,7 +3135,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -490,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2110,50 +3147,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -685,7 +688,7 @@
+@@ -655,7 +658,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm cr16-app-artscontrol.png cr16-action-artsbuilderexecute.png Synth_ATAN_SATURATE.xpm Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_RC.xpm Synth_DEBUG.xpm cr16-app-artsbuilder.png Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm crsc-app-artsbuilder.svgz Synth_MIDI_DEBUG.xpm Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm crsc-app-artscontrol.svgz Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm 
-+KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm Synth_ATAN_SATURATE.xpm cr16-app-artscontrol.png cr16-action-artsbuilderexecute.png Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_DEBUG.xpm cr16-app-artsbuilder.png Synth_RC.xpm Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm Synth_MIDI_DEBUG.xpm crsc-app-artsbuilder.svgz Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm crsc-app-artscontrol.svgz Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm 
+-KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm hisc-app-artscontrol.svgz cr16-action-artsbuilderexecute.png Synth_ATAN_SATURATE.xpm Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm hisc-app-artsbuilder.svgz hi16-app-artsbuilder.png Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_RC.xpm Synth_DEBUG.xpm Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm Synth_MIDI_DEBUG.xpm Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm hi16-app-artscontrol.png Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm 
++KDE_DIST=Synth_MUL.xpm hisc-app-artscontrol.svgz Synth_SHELVE_CUTOFF.xpm Synth_ATAN_SATURATE.xpm cr16-action-artsbuilderexecute.png Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm hisc-app-artsbuilder.svgz hi16-app-artsbuilder.png Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_DEBUG.xpm Synth_RC.xpm Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm Synth_MIDI_DEBUG.xpm Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm hi16-app-artscontrol.png Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm 
  
  #>+ 2
  docs-am:
-@@ -694,18 +697,18 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-artsbuilder.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-artsbuilder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-artsbuilderexecute.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsbuilderexecute.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-artsbuilderexecute.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsbuilderexecute.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-artsbuilder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsbuilderexecute.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsbuilderexecute.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
- 
- #>+ 15
- force-reedit:
 --- arts/examples/Makefile.in
 +++ arts/examples/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -206,6 +206,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -501,7 +504,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -2162,7 +3177,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2174,7 +3189,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -750,7 +753,7 @@
+@@ -720,7 +723,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -2185,17 +3200,17 @@
  docs-am:
 --- arts/gui/common/Makefile.in
 +++ arts/gui/common/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -247,6 +247,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -500,7 +503,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -2204,7 +3219,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -538,9 +541,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2218,17 +3233,17 @@
  	@$(NORMAL_INSTALL)
 --- arts/gui/kde/Makefile.in
 +++ arts/gui/kde/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -285,6 +285,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -545,7 +548,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2237,7 +3252,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2249,7 +3264,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1120,18 +1123,18 @@
+@@ -1091,18 +1094,18 @@
  mocs: kcombobox_impl.moc
  
  #>+ 3
@@ -2274,7 +3289,7 @@
  
  #>+ 3
  kbutton_impl.moc: $(srcdir)/kbutton_impl.h
-@@ -1155,18 +1158,18 @@
+@@ -1126,18 +1129,18 @@
  mocs: kpoti.moc
  
  #>+ 3
@@ -2299,7 +3314,7 @@
  
  #>+ 3
  kpoti_impl.moc: $(srcdir)/kpoti_impl.h
-@@ -1198,10 +1201,10 @@
+@@ -1169,10 +1172,10 @@
  
  #>+ 3
  clean-metasources:
@@ -2312,7 +3327,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1249,7 +1252,7 @@
+@@ -1220,7 +1223,7 @@
  
  
  #>+ 11
@@ -2323,17 +3338,17 @@
  	echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
 --- arts/gui/kde/mcopclass/Makefile.in
 +++ arts/gui/kde/mcopclass/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -435,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -2342,7 +3357,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2354,7 +3369,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -665,7 +668,7 @@
+@@ -635,7 +638,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -2365,17 +3380,17 @@
  docs-am:
 --- arts/gui/Makefile.in
 +++ arts/gui/Makefile.in
-@@ -216,6 +216,9 @@
+@@ -209,6 +209,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -437,7 +440,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -2384,7 +3399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -475,9 +478,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2398,17 +3413,17 @@
  mostlyclean-libtool:
 --- arts/Makefile.in
 +++ arts/Makefile.in
-@@ -216,6 +216,9 @@
+@@ -209,6 +209,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -437,7 +440,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -2417,7 +3432,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -475,9 +478,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2431,17 +3446,17 @@
  mostlyclean-libtool:
 --- arts/midi/Makefile.in
 +++ arts/midi/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -303,6 +303,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -571,7 +574,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -2450,7 +3465,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2462,7 +3477,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1149,7 +1152,7 @@
+@@ -1121,7 +1124,7 @@
  
  
  #>+ 2
@@ -2473,17 +3488,17 @@
  clean-closures:
 --- arts/midi/mcopclass/Makefile.in
 +++ arts/midi/mcopclass/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -431,7 +434,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -2492,7 +3507,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2506,17 +3521,17 @@
  mostlyclean-libtool:
 --- arts/modules/common/Makefile.in
 +++ arts/modules/common/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -260,6 +260,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -531,7 +534,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -2525,7 +3540,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -569,9 +572,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2539,17 +3554,17 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/effects/freeverb/Makefile.in
 +++ arts/modules/effects/freeverb/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -227,6 +227,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -455,7 +458,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2558,7 +3573,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -493,9 +496,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2570,7 +3585,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -756,7 +759,7 @@
+@@ -726,7 +729,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -2581,17 +3596,17 @@
  docs-am:
 --- arts/modules/effects/Makefile.in
 +++ arts/modules/effects/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -283,6 +283,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -572,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -2600,7 +3615,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2614,17 +3629,17 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/Makefile.in
 +++ arts/modules/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -265,6 +265,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -541,7 +544,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -2633,7 +3648,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -579,9 +582,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2645,7 +3660,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1021,7 +1024,7 @@
+@@ -993,7 +996,7 @@
  
  
  #>+ 2
@@ -2656,17 +3671,17 @@
  clean-closures:
 --- arts/modules/mixers/Makefile.in
 +++ arts/modules/mixers/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -258,6 +258,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -538,7 +541,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -2675,7 +3690,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -576,9 +579,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2689,17 +3704,17 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/synth/Makefile.in
 +++ arts/modules/synth/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -288,6 +288,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -570,7 +573,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -2708,7 +3723,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -608,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2722,17 +3737,17 @@
  	@$(NORMAL_INSTALL)
 --- arts/runtime/Makefile.in
 +++ arts/runtime/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -255,6 +255,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -509,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -2741,7 +3756,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -547,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2753,7 +3768,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -912,7 +915,7 @@
+@@ -882,7 +885,7 @@
  
  
  #>+ 2
@@ -2764,17 +3779,17 @@
  clean-closures:
 --- arts/tools/Makefile.in
 +++ arts/tools/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -291,6 +291,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2783,7 +3798,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2795,7 +3810,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1171,18 +1174,18 @@
+@@ -1160,18 +1163,18 @@
  mocs: audiomanager.moc
  
  #>+ 3
@@ -2820,7 +3835,7 @@
  
  #>+ 3
  choosebusdlg.moc: $(srcdir)/choosebusdlg.h
-@@ -1251,10 +1254,10 @@
+@@ -1240,10 +1243,10 @@
  
  #>+ 3
  clean-metasources:
@@ -2835,17 +3850,17 @@
  clean-ui:
 --- arts/tools/pics/Makefile.in
 +++ arts/tools/pics/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -420,7 +423,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -2854,7 +3869,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2866,206 +3881,208 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -633,7 +636,7 @@
+@@ -603,113 +606,113 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=crsc-action-artsmidimanager.svg cr64-action-artsaudiomanager.png cr22-action-artsfftscope.png cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr22-action-artsmediatypes.png cr22-app-artscontrol.png cr48-action-artsmediatypes.png cr64-action-artsmediatypes.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png cr32-action-artsenvironment.png cr16-action-artsaudiomanager.png cr32-action-artsaudiomanager.png crsc-action-artsaudiomanager.svg cr64-action-artsenvironment.png cr48-action-artsaudiomanager.png cr16-action-artsmidimanager.png cr16-app-artscontrol.png cr16-action-artsenvironment.png crsc-action-artsfftscope.svg cr48-action-artsenvironment.png cr128-action-artsfftscope.png cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr48-app-artscontrol.png cr32-app-artscontrol.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png crsc-action-artsmediatypes.svg cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr128-app-artscontrol.png crsc-app-artscontrol.svg cr16-action-artsmediatypes.png cr64-app-artscontrol.png cr128-action-artsmidimanager.png cr22-action-artsaudiomanager.png crsc-action-artsenvironment.svg Makefile.am cr128-action-artsmediatypes.png 
-+KDE_DIST=crsc-action-artsmidimanager.svg cr48-action-artsaudiomanager.png cr16-action-artsmidimanager.png cr64-action-artsaudiomanager.png cr16-app-artscontrol.png cr16-action-artsenvironment.png cr22-action-artsfftscope.png crsc-action-artsfftscope.svg cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr48-action-artsenvironment.png cr22-action-artsmediatypes.png cr128-action-artsfftscope.png cr22-app-artscontrol.png cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr48-action-artsmediatypes.png cr48-app-artscontrol.png cr64-action-artsmediatypes.png cr32-app-artscontrol.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png crsc-action-artsmediatypes.svg cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr128-app-artscontrol.png crsc-app-artscontrol.svg cr16-action-artsmediatypes.png cr32-action-artsenvironment.png cr64-app-artscontrol.png cr128-action-artsmidimanager.png cr32-action-artsaudiomanager.png cr16-action-artsaudiomanager.png crsc-action-artsaudiomanager.svg cr22-action-artsaudiomanager.png cr64-action-artsenvironment.png crsc-action-artsenvironment.svg Makefile.am cr128-action-artsmediatypes.png 
+-KDE_DIST=cr64-action-artsaudiomanager.png crsc-action-artsmidimanager.svgz cr22-action-artsfftscope.png cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr22-action-artsmediatypes.png cr48-action-artsmediatypes.png hi22-app-artscontrol.png cr64-action-artsmediatypes.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png hi32-app-artscontrol.png cr32-action-artsenvironment.png hi16-app-artscontrol.png crsc-action-artsmediatypes.svgz cr16-action-artsaudiomanager.png cr32-action-artsaudiomanager.png cr64-action-artsenvironment.png cr48-action-artsaudiomanager.png hisc-app-artscontrol.svgz cr16-action-artsmidimanager.png cr16-action-artsenvironment.png cr48-action-artsenvironment.png cr128-action-artsfftscope.png crsc-action-artsenvironment.svgz cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png crsc-action-artsaudiomanager.svgz hi48-app-artscontrol.png hi64-app-artscontrol.png cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr16-action-artsmediatypes.png crsc-action-artsfftscope.svgz cr128-action-artsmidimanager.png cr22-action-artsaudiomanager.png Makefile.am cr128-action-artsmediatypes.png hi128-app-artscontrol.png 
++KDE_DIST=cr48-action-artsaudiomanager.png hisc-app-artscontrol.svgz cr16-action-artsmidimanager.png cr64-action-artsaudiomanager.png crsc-action-artsmidimanager.svgz cr16-action-artsenvironment.png cr22-action-artsfftscope.png cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr48-action-artsenvironment.png cr22-action-artsmediatypes.png cr128-action-artsfftscope.png crsc-action-artsenvironment.svgz cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr48-action-artsmediatypes.png hi22-app-artscontrol.png cr64-action-artsmediatypes.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png crsc-action-artsaudiomanager.svgz cr128-action-artsenvironment.png hi48-app-artscontrol.png hi64-app-artscontrol.png cr32-action-artsmidimanager.png cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr16-action-artsmediatypes.png cr32-action-artsenvironment.png hi32-app-artscontrol.png crsc-action-artsfftscope.svgz cr128-action-artsmidimanager.png hi16-app-artscontrol.png crsc-action-artsmediatypes.svgz cr32-action-artsaudiomanager.png cr16-action-artsaudiomanager.png cr22-action-artsaudiomanager.png cr64-action-artsenvironment.png Makefile.am cr128-action-artsmediatypes.png hi128-app-artscontrol.png 
  
  #>+ 2
  docs-am:
-@@ -641,105 +644,105 @@
+ 
  #>+ 102
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/hisc-app-artscontrol.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
+ 	$(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
 +	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/artscontrol.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
--	$(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
--	$(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
--	$(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svgz
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
  	$(INSTALL_DATA) $(srcdir)/cr16-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
--	$(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
--	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
--	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
 +	$(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
 +	$(INSTALL_DATA) $(srcdir)/cr64-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
 +	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
++	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmediatypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
 +	$(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-artscontrol.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
--	$(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
--	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-artscontrol.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
--	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
--	$(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
++	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
 +	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
++	$(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmediatypes.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svg
+ 	$(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/artscontrol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmediatypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
--	$(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/artscontrol.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/artscontrol.svgz
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svgz
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/artscontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/artscontrol.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svg
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/artscontrol.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/artscontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/artscontrol.png
  
  #>+ 15
  force-reedit:
 --- audiofile_artsplugin/Makefile.in
 +++ audiofile_artsplugin/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -245,6 +245,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -486,7 +489,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -3074,7 +4091,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -524,9 +527,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3086,18 +4103,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -884,7 +887,7 @@
+@@ -854,7 +857,7 @@
  
  
  #>+ 2
--KDE_DIST=audiofilearts.idl configure.in.in Makefile.in audiofilePlayObject.mcopclass Makefile.am 
-+KDE_DIST=configure.in.in audiofilearts.idl Makefile.in audiofilePlayObject.mcopclass Makefile.am 
+-KDE_DIST=configure.in.bot audiofilearts.idl configure.in.in Makefile.in audiofilePlayObject.mcopclass Makefile.am 
++KDE_DIST=configure.in.bot configure.in.in audiofilearts.idl Makefile.in audiofilePlayObject.mcopclass Makefile.am 
  
  #>+ 3
  clean-closures:
 --- config.h.in
 +++ config.h.in
-@@ -315,9 +315,6 @@
+@@ -266,9 +266,6 @@
     header file. */
  #undef HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H
  
@@ -3109,12 +4126,31 @@
  
 --- configure
 +++ configure
+@@ -278,15 +278,15 @@
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS compile_ogg_export_TRUE compile_ogg_export_FALSE LIBOSSAUDIO LIBASOUND ARTS_LIBASOUND CDPARANOIA_LIBS include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE LAME_LIBS compile_mp3_export_TRUE compile_mp3_export_FALSE TAGLIB_CONFIG taglib_includes taglib_libs AKODE_CONFIG akode_includes akode_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE LIBFLAC LIBOGGFLAC LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_artsplugin_SUBDIR_included_TRUE akode_artsplugin_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS compile_ogg_export_TRUE compile_ogg_export_FALSE LIBOSSAUDIO LIBASOUND ARTS_LIBASOUND CDPARANOIA_LIBS include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE LAME_LIBS compile_mp3_export_TRUE compile_mp3_export_FALSE TAGLIB_CONFIG taglib_includes taglib_libs AKODE_CONFIG akode_includes akode_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE PKG_CONFIG GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE LIBFLAC LIBOGGFLAC LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_artsplugin_SUBDIR_included_TRUE akode_artsplugin_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -3136,6 +4172,15 @@
    done
  fi
  
+@@ -1983,7 +1985,7 @@
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE=kdemultimedia
++ PACKAGE=kdemultimedia-rc1
+  VERSION="3.5"
+ 
+ 
 @@ -2114,6 +2116,31 @@
  
  
@@ -3674,19 +4719,58 @@
    fi
  
  
-@@ -7072,10 +6888,10 @@
-     fi
-   done
- done
-+SED=$lt_cv_path_SED
+@@ -7047,7 +6863,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
++  test ! -f $lt_ac_sed && continue
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -7152,7 +6968,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -7186,7 +7002,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -7216,6 +7032,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
  
- fi
+ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+@@ -7302,44 +7127,36 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--SED=$lt_cv_path_SED
- echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6
- 
-@@ -7309,31 +7125,23 @@
+-bsdi4*)
++bsdi[45]*)
+   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
    ;;
  
  cygwin*)
@@ -3721,12 +4805,28 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7372,42 +7180,21 @@
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -7355,7 +7172,7 @@
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
++  case $host_cpu in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -7372,42 +7189,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -3776,9 +4876,21 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7436,9 +7223,6 @@
+@@ -7426,19 +7222,14 @@
    ;;
  
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   fi
+   ;;
+ 
  osf3* | osf4* | osf5*)
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -3786,7 +4898,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7448,7 +7232,6 @@
+@@ -7448,7 +7239,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -3794,18 +4906,21 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7525,7 +7308,7 @@
+@@ -7525,7 +7315,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7528 "configure"' > conftest.$ac_ext
-+  echo '#line 7311 "configure"' > conftest.$ac_ext
++  echo '#line 7318 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7570,12 +7353,11 @@
+@@ -7568,14 +7358,13 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-     case "`/usr/bin/file conftest.o`" in
+-    case "`/usr/bin/file conftest.o`" in
++    case `/usr/bin/file conftest.o` in
      *32-bit*)
 -      LINUX_64_MODE="32"
        case $host in
@@ -3817,7 +4932,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7587,7 +7369,6 @@
+@@ -7587,7 +7376,6 @@
        esac
        ;;
      *64-bit*)
@@ -3825,7 +4940,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7647,8 +7428,7 @@
+@@ -7647,8 +7435,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3835,7 +4950,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7723,8 +7503,7 @@
+@@ -7723,8 +7510,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3845,7 +4960,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7894,8 +7673,7 @@
+@@ -7894,8 +7680,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3855,7 +4970,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7962,8 +7740,7 @@
+@@ -7962,8 +7747,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3865,16 +4980,260 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8170,7 +7947,7 @@
+@@ -8078,6 +7862,243 @@
  
+ done
  
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++if test -z "$CXXCPP"; then
++  if test "${ac_cv_prog_CXXCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++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
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++fi
++
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -8170,7 +8191,7 @@
+ 
+ 
  # Provide some information about the compiler.
 -echo "$as_me:8173:" \
-+echo "$as_me:7950:" \
++echo "$as_me:8194:" \
       "checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
  { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8216,8 +7993,7 @@
+@@ -8216,8 +8237,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3884,7 +5243,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8266,8 +8042,7 @@
+@@ -8266,8 +8286,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3894,7 +5253,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8325,7 +8100,7 @@
+@@ -8325,7 +8344,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -3903,24 +5262,52 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8354,20 +8129,26 @@
+@@ -8354,20 +8373,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-  *)
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
 -    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
 -	       = "XX$testring") >/dev/null 2>&1 &&
 -	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-+    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
  	    lt_cv_sys_max_cmd_len=$new_result &&
@@ -3935,7 +5322,31 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -8435,7 +8216,7 @@
+@@ -8404,9 +8456,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -8428,6 +8477,13 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDGIRSTW]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
+ irix* | nonstopux*)
+   symcode='[BCDEGRST]'
+   ;;
+@@ -8435,7 +8491,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -3944,7 +5355,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8453,7 +8234,7 @@
+@@ -8453,14 +8509,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -3953,35 +5364,256 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -9202,11 +8983,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ for ac_symprfx in "" "_"; do
+ 
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+   # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+@@ -8622,7 +8681,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+ 
+ # Same as above, but do not quote variable references.
+@@ -8642,7 +8701,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -8927,6 +8986,17 @@
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -8952,7 +9022,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -9014,7 +9084,7 @@
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+@@ -9113,6 +9183,20 @@
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -9149,11 +9233,16 @@
+    LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
++     # The linker can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&5
++       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++       $SED '/^$/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_prog_compiler_static_works=yes
++       fi
+      else
+        lt_prog_compiler_static_works=yes
+      fi
+@@ -9199,18 +9288,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8986: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9294: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9209: \$? = $ac_status" >&5
-+   echo "$as_me:8990: \$? = $ac_status" >&5
++   echo "$as_me:9298: \$? = $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
-@@ -9435,11 +9216,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+@@ -9287,7 +9378,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -9313,6 +9404,16 @@
+ 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic='-qnocommon'
++         lt_prog_compiler_wl='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -9324,7 +9425,7 @@
+       lt_prog_compiler_wl='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -9348,12 +9449,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl='-Wl,'
+ 	lt_prog_compiler_pic='-KPIC'
+ 	lt_prog_compiler_static='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fpic'
++	lt_prog_compiler_static='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl='-Wl,'
+         # All Alpha code is PIC.
+@@ -9374,9 +9482,14 @@
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -9398,6 +9511,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic='-pic'
+       lt_prog_compiler_static='-Bstatic'
+@@ -9432,18 +9550,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9438: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9219: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9556: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9442: \$? = $ac_status" >&5
-+   echo "$as_me:9223: \$? = $ac_status" >&5
++   echo "$as_me:9560: \$? = $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
-@@ -9486,13 +9267,6 @@
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works=yes
+      fi
+    fi
+@@ -9464,7 +9584,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic=
+@@ -9486,38 +9606,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -3995,26 +5627,35 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -9502,11 +9276,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9505: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9279: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9618: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9509: \$? = $ac_status" >&5
-+   echo "$as_me:9283: \$? = $ac_status" >&5
++   echo "$as_me:9622: \$? = $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
-@@ -9516,8 +9290,11 @@
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -4023,7 +5664,52 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9645,7 +9422,7 @@
+@@ -9588,6 +9706,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -9608,6 +9736,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -9645,7 +9794,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -4032,7 +5718,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9655,13 +9432,13 @@
+@@ -9655,13 +9804,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec='-L$libdir'
@@ -4040,7 +5726,8 @@
 +      allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
-       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -4048,7 +5735,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9670,19 +9447,19 @@
+@@ -9670,19 +9819,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -4060,6 +5747,38 @@
        ;;
  
 -    netbsd*)
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs=no
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4072,7 +5791,7 @@
        fi
        ;;
  
-@@ -9700,8 +9477,8 @@
+@@ -9700,8 +9881,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4083,36 +5802,8 @@
        else
  	ld_shlibs=no
        fi
-@@ -9714,10 +9491,36 @@
-       hardcode_shlibpath_var=no
-       ;;
+@@ -9716,24 +9897,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs=no
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -4122,7 +5813,28 @@
        else
  	ld_shlibs=no
        fi
-@@ -9767,9 +9570,20 @@
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec=
+-      fi
++    if test "$ld_shlibs" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec=
++      export_dynamic_flag_spec=
++      whole_archive_flag_spec=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -9767,9 +9943,20 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -4145,7 +5857,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9815,21 +9629,22 @@
+@@ -9786,7 +9973,7 @@
+       link_all_deplibs=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -9807,6 +9994,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -9815,21 +10005,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -4173,7 +5904,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9853,8 +9668,7 @@
+@@ -9853,8 +10044,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4183,7 +5914,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9881,14 +9695,13 @@
+@@ -9881,14 +10071,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -4201,7 +5932,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9915,8 +9728,7 @@
+@@ -9915,8 +10104,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4211,16 +5942,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9954,7 +9766,7 @@
+@@ -9953,8 +10141,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
 -	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
  	fi
        fi
        ;;
-@@ -9977,13 +9789,13 @@
+@@ -9967,7 +10155,7 @@
+       ld_shlibs=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+@@ -9977,13 +10165,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -4237,14 +5979,17 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -9997,21 +9809,21 @@
-       archive_cmds_need_lc=no
-       case "$host_os" in
-       rhapsody* | darwin1.[012])
+@@ -9993,52 +10181,52 @@
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
 -	allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+	allow_undefined_flag='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
 -	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
@@ -4257,58 +6002,88 @@
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -10020,18 +9832,18 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc=no
        hardcode_direct=no
        hardcode_automatic=yes
        hardcode_shlibpath_var=unsupported
-@@ -10072,8 +9884,8 @@
+-      whole_archive_flag_spec='-all_load $convenience'
++      whole_archive_flag_spec=''
+       link_all_deplibs=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+-      ld_shlibs=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs=no
++          ;;
++      esac
+     fi
        ;;
  
+@@ -10072,8 +10260,8 @@
+       ;;
+ 
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10081,7 +9893,7 @@
+@@ -10081,7 +10269,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -4317,9 +6092,12 @@
        else
  	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -10099,10 +9911,10 @@
+@@ -10097,16 +10285,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	case $host_cpu in
  	hppa*64*|ia64*)
 -	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -4330,7 +6108,21 @@
  	  ;;
  	esac
        else
-@@ -10149,7 +9961,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -10116,7 +10304,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ 	  hardcode_libdir_flag_spec_ld='+b $libdir'
+@@ -10149,7 +10337,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -4339,7 +6131,7 @@
        else
  	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10159,7 +9971,7 @@
+@@ -10159,7 +10347,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -4348,16 +6140,17 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10182,7 +9994,7 @@
+@@ -10182,7 +10370,8 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10192,7 +10004,7 @@
+@@ -10192,7 +10381,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -4366,7 +6159,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10203,14 +10015,14 @@
+@@ -10203,14 +10392,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -4383,7 +6176,7 @@
        else
  	allow_undefined_flag=' -expect_unresolved \*'
  	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10222,7 +10034,7 @@
+@@ -10222,13 +10411,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4392,19 +6185,50 @@
  	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag=' -expect_unresolved \*'
-@@ -10247,9 +10059,9 @@
+ 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10247,10 +10436,12 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
 -	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10269,7 +10081,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -10259,8 +10450,18 @@
+       hardcode_shlibpath_var=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs=yes
+       ;;
+@@ -10269,7 +10470,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -4413,7 +6237,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10329,9 +10141,9 @@
+@@ -10329,9 +10530,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -4425,7 +6249,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10437,7 +10249,7 @@
+@@ -10437,7 +10638,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -4434,7 +6258,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10447,7 +10259,20 @@
+@@ -10447,7 +10648,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4456,7 +6280,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10512,7 +10337,7 @@
+@@ -10512,7 +10726,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4465,8 +6289,17 @@
    ;;
  
  beos*)
-@@ -10537,7 +10362,7 @@
+@@ -10521,7 +10735,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10537,7 +10751,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -4474,34 +6307,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10602,7 +10427,7 @@
+@@ -10549,7 +10763,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -10579,7 +10794,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -10602,7 +10817,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10625,7 +10450,7 @@
+@@ -10625,7 +10840,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10685,7 +10510,7 @@
+@@ -10637,8 +10852,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -10656,7 +10880,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -10683,9 +10907,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10700,7 +10525,7 @@
+@@ -10700,7 +10924,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -4510,7 +6394,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10711,7 +10536,7 @@
+@@ -10711,7 +10935,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -4519,7 +6403,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10773,22 +10598,19 @@
+@@ -10773,22 +10997,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -4541,14 +6425,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10798,6 +10620,30 @@
+@@ -10798,6 +11019,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -4579,7 +6463,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10807,7 +10653,7 @@
+@@ -10807,7 +11052,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -4588,16 +6472,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10836,7 +10682,7 @@
+@@ -10836,7 +11081,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -10856,7 +10702,7 @@
+@@ -10856,7 +11105,7 @@
  
  os2*)
    libname_spec='$name'
@@ -4606,7 +6494,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11085,8 +10931,7 @@
+@@ -10958,8 +11207,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var " || \
+-   test "X$hardcode_automatic"="Xyes" ; then
++   test -n "$runpath_var" || \
++   test "X$hardcode_automatic" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct" != no &&
+@@ -11085,8 +11334,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4616,7 +6515,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11189,8 +11034,7 @@
+@@ -11189,8 +11437,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4626,7 +6525,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11255,8 +11099,7 @@
+@@ -11255,8 +11502,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4636,7 +6535,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11349,8 +11192,7 @@
+@@ -11349,8 +11595,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4646,7 +6545,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11415,8 +11257,7 @@
+@@ -11415,8 +11660,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4656,7 +6555,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11482,8 +11323,7 @@
+@@ -11482,8 +11726,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4666,7 +6565,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11549,8 +11389,7 @@
+@@ -11549,8 +11792,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4676,25 +6575,52 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11625,7 +11464,7 @@
+@@ -11625,7 +11867,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11628 "configure"
-+#line 11467 "configure"
++#line 11870 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11723,7 +11562,7 @@
+@@ -11691,7 +11933,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -11723,7 +11965,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11726 "configure"
-+#line 11565 "configure"
++#line 11968 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11848,7 +11687,7 @@
+@@ -11789,7 +12031,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -11839,7 +12081,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -11848,47 +12090,10 @@
    fi
    ;;
  
@@ -4703,18 +6629,18 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -11858,29 +11697,29 @@
-     archive_cmds_need_lc=no
-     case "$host_os" in
-     rhapsody* | darwin1.[012])
+-  ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    archive_cmds_need_lc=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
 -      allow_undefined_flag='-Wl,-undefined -Wl,suppress'
-+      allow_undefined_flag='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
 -	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	allow_undefined_flag='-flat_namespace -undefined suppress'
-       else
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.012)
 -	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -4723,31 +6649,27 @@
 -	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag='-undefined dynamic_lookup'
-+            ;;
-+        esac
-       fi
-       ;;
-     esac
-     output_verbose_link_cmd='echo'
+-      fi
+-      ;;
+-    esac
+-    output_verbose_link_cmd='echo'
 -    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
 -    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
 -    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     hardcode_direct=no
-     hardcode_automatic=yes
-     hardcode_shlibpath_var=unsupported
-@@ -11914,7 +11753,8 @@
+-    hardcode_direct=no
+-    hardcode_automatic=yes
+-    hardcode_shlibpath_var=unsupported
+-    whole_archive_flag_spec='-all_load $convenience'
+-    link_all_deplibs=yes
+-  else
+-    ld_shlibs=no
+-  fi
+     ;;
+ esac
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -11914,7 +12119,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -4757,7 +6679,34 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12092,7 +11932,7 @@
+@@ -12028,11 +12234,11 @@
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -12062,6 +12268,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -12092,7 +12304,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -4766,7 +6715,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12123,7 +11963,7 @@
+@@ -12123,7 +12335,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -4775,7 +6724,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12365,7 +12205,10 @@
+@@ -12138,7 +12350,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -12365,7 +12577,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -4787,7 +6745,84 @@
  fi
  
  
-@@ -12633,8 +12476,8 @@
+@@ -12430,7 +12645,9 @@
+ 
+       case $tagname in
+       CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
+ 	  ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -12467,7 +12684,7 @@
+ compiler_lib_search_path_CXX=
+ 
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -12488,6 +12705,20 @@
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -12509,7 +12740,16 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -12580,7 +12820,7 @@
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
++      # but apparently some variants of GNU ld only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+@@ -12614,7 +12854,7 @@
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+@@ -12633,8 +12873,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -4798,7 +6833,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12660,7 +12503,7 @@
+@@ -12660,7 +12900,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -4807,7 +6842,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12691,8 +12534,22 @@
+@@ -12691,8 +12931,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -4832,7 +6867,26 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12738,15 +12595,16 @@
+@@ -12709,7 +12963,7 @@
+     link_all_deplibs_CXX=yes
+ 
+     if test "$GXX" = yes; then
+-      case $host_os in aix4.012|aix4.012.*)
++      case $host_os in aix4.[012]|aix4.[012].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+@@ -12730,6 +12984,9 @@
+ 	fi
+       esac
+       shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+@@ -12738,15 +12995,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -4853,7 +6907,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -12776,8 +12634,7 @@
+@@ -12776,8 +13034,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4863,7 +6917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12806,13 +12663,12 @@
+@@ -12806,13 +13063,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -4879,7 +6933,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12839,8 +12695,7 @@
+@@ -12839,8 +13095,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4889,16 +6943,23 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12878,7 +12733,7 @@
+@@ -12877,8 +13132,8 @@
+ 	# Exported symbols can be pulled into shared objects from archives
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
- 	# This is similar to how AIX traditionally builds it's shared libraries.
+-	# This is similar to how AIX traditionally builds it's shared libraries.
 -	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	# This is similar to how AIX traditionally builds its shared libraries.
 +	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
        fi
      fi
      ;;
-@@ -12895,12 +12750,12 @@
+@@ -12891,16 +13146,17 @@
+     esac
+     ;;
+ 
++
+   cygwin* | mingw* | pw32*)
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
      # as there is no search path for DLLs.
      hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -4913,7 +6974,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12909,7 +12764,7 @@
+@@ -12909,70 +13165,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -4922,87 +6983,170 @@
      else
        ld_shlibs_CXX=no
      fi
-@@ -12920,20 +12775,20 @@
-     archive_cmds_need_lc_CXX=no
-     case "$host_os" in
-     rhapsody* | darwin1.[012])
+   ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    archive_cmds_need_lc_CXX=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
 -      allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress'
-+      allow_undefined_flag_CXX='-undefined suppress'
-       ;;
-     *) # Darwin 1.3 on
-       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-       else
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-      else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.012)
--	    allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	    allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	    ;;
 -	  10.*)
--	    allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-+            ;;
-+        esac
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
        fi
-       ;;
-     esac
-@@ -12943,19 +12798,19 @@
-       lt_int_apple_cc_single_mod=yes
-     fi
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     else
+-    else
 -      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     fi
+-    fi
 -    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- 
-     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
+-    else
 -      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     fi
+-    fi
 -    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     hardcode_direct_CXX=no
-     hardcode_automatic_CXX=yes
-     hardcode_shlibpath_var_CXX=unsupported
-@@ -12990,7 +12845,7 @@
+-    hardcode_direct_CXX=no
+-    hardcode_automatic_CXX=yes
+-    hardcode_shlibpath_var_CXX=unsupported
+-    whole_archive_flag_spec_CXX='-all_load $convenience'
+-    link_all_deplibs_CXX=yes
+-  else
+-    ld_shlibs_CXX=no
+-  fi
+-    ;;
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
++      fi
++        ;;
+ 
+   dgux*)
+     case $cc_basename in
+-      ec++)
++      ec++*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      ghcx)
++      ghcx*)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -12983,14 +13250,14 @@
+ 	;;
+     esac
+     ;;
+-  freebsd12*)
++  freebsd[12]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     ld_shlibs_CXX=no
+     ;;
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
--  freebsd*)
-+  freebsd* | kfreebsd*-gnu)
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13012,7 +12867,7 @@
+@@ -13007,12 +13274,12 @@
+ 				# location of the library.
+ 
+     case $cc_basename in
+-    CC)
++    CC*)
+       # FIXME: insert proper C++ library support
        ld_shlibs_CXX=no
        ;;
-     aCC)
+-    aCC)
 -      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++    aCC*)
 +      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13021,11 +12876,11 @@
+@@ -13021,11 +13288,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
 -      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
      *)
        if test "$GXX" = yes; then
@@ -5011,7 +7155,38 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13082,7 +12937,7 @@
+@@ -13035,7 +13302,7 @@
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*)
+ 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+@@ -13051,7 +13318,7 @@
+         ;;
+       esac
+     fi
+-    case "$host_cpu" in
++    case $host_cpu in
+     hppa*64*)
+       hardcode_direct_CXX=no
+       hardcode_shlibpath_var_CXX=no
+@@ -13072,17 +13339,17 @@
+     esac
+ 
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
++      aCC*)
++	case $host_cpu in
+ 	hppa*64*|ia64*)
  	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -5020,7 +7195,13 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13103,7 +12958,7 @@
+@@ -13098,12 +13365,12 @@
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    ia64*|hppa*64*)
  	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -5029,28 +7210,38 @@
  	      ;;
  	    esac
  	  fi
-@@ -13118,7 +12973,7 @@
+@@ -13116,9 +13383,9 @@
+     ;;
+   irix5* | irix6*)
      case $cc_basename in
-       CC)
+-      CC)
++      CC*)
  	# SGI C++
 -	archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13129,9 +12984,9 @@
+@@ -13129,9 +13396,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
 -	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  	  else
 -	    archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 +	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13148,8 +13003,8 @@
+@@ -13142,14 +13409,14 @@
+     ;;
+   linux*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -5061,19 +7252,49 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13171,16 +13026,16 @@
+@@ -13167,20 +13434,44 @@
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+-      icpc)
++      icpc*)
  	# Intel C++
  	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
  	archive_cmds_need_lc_CXX=no
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
  	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
-       cxx)
+-      cxx)
++      pgCC*)
++        # Portland Group C++ compiler
++	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
  	# Compaq C++
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -5082,8 +7303,17 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13218,7 +13073,7 @@
+@@ -13208,7 +13499,7 @@
+     ;;
+   mvs*)
+     case $cc_basename in
+-      cxx)
++      cxx*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
  	;;
+@@ -13218,7 +13509,7 @@
+ 	;;
      esac
      ;;
 -  netbsd*)
@@ -5091,7 +7321,32 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13237,7 +13092,7 @@
+@@ -13229,15 +13520,31 @@
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    hardcode_direct_CXX=yes
++    hardcode_shlibpath_var_CXX=no
++    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      export_dynamic_flag_spec_CXX='${wl}-E'
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
+   osf3*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -5100,25 +7355,41 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13254,7 +13109,7 @@
+@@ -13247,14 +13554,14 @@
+ 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ 
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
++      cxx*)
  	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13272,7 +13127,7 @@
+@@ -13272,7 +13579,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13297,7 +13152,7 @@
+@@ -13291,13 +13598,13 @@
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+-      KCC)
++      KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -5127,50 +7398,123 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13313,10 +13168,10 @@
+@@ -13306,17 +13613,17 @@
+ 	# the KAI C++ compiler.
+ 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
-       cxx)
+-      RCC)
++      RCC*)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      cxx)
++      cxx*)
  	allow_undefined_flag_CXX=' -expect_unresolved \*'
 -	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
  	  echo "-hidden">> $lib.exp~
 -	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13335,7 +13190,7 @@
+@@ -13335,7 +13642,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 -	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13392,9 +13247,9 @@
-       CC)
+@@ -13359,7 +13666,7 @@
+   sco*)
+     archive_cmds_need_lc_CXX=no
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+@@ -13371,12 +13678,12 @@
+     ;;
+   sunos4*)
+     case $cc_basename in
+-      CC)
++      CC*)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+-      lcc)
++      lcc*)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13389,36 +13696,33 @@
+     ;;
+   solaris*)
+     case $cc_basename in
+-      CC)
++      CC*)
  	# Sun C++ 4.2, 5.x and Centerline C++
++        archive_cmds_need_lc_CXX=yes
  	no_undefined_flag_CXX=' -zdefs'
 -	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-R$libdir'
  	hardcode_shlibpath_var_CXX=no
-@@ -13428,7 +13283,7 @@
+ 	case $host_os in
+-	  solaris2.0-5 | solaris2.0-5.*) ;;
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+-	    # linker.
++	    # linker. We must also pass each convience library through
++	    # to the system linker between allextract/defaultextract.
++	    # The C++ compiler will combine linker options so we
++	    # cannot just pass the convience library names through
++	    # without $wl.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	link_all_deplibs_CXX=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	output_verbose_link_cmd='echo'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+@@ -13426,9 +13730,9 @@
+ 	# in the archive.
+ 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
-       gcx)
+-      gcx)
++      gcx*)
  	# Green Hills C++ Compiler
 -	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
 +	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13438,9 +13293,9 @@
+@@ -13438,9 +13742,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -5182,7 +7526,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13449,9 +13304,9 @@
+@@ -13449,9 +13753,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -5194,7 +7538,25 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13566,7 +13421,7 @@
+@@ -13469,7 +13773,7 @@
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
++      NCC*)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+@@ -13526,7 +13830,7 @@
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+@@ -13566,7 +13870,7 @@
         fi
         ;;
  
@@ -5203,17 +7565,142 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13701,7 +13556,7 @@
+@@ -13602,6 +13906,20 @@
+ 
+ $rm -f confest.$objext
+ 
++# PORTME: override above test on systems where it is broken
++case $host_os in
++solaris*)
++  case $cc_basename in
++  CC*)
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    postdeps_CXX='-lCstd -lCrun'
++    ;;
++  esac
++esac
++
++
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -13657,7 +13975,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+@@ -13682,18 +14000,28 @@
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+-	cxch68)
++	cxch68*)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           lt_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
+       dgux*)
+ 	case $cc_basename in
+-	  ec++)
++	  ec++*)
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
+-	  ghcx)
++	  ghcx*)
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -13701,22 +14029,22 @@
+ 	    ;;
  	esac
  	;;
--      freebsd*)
-+      freebsd* | kfreebsd*-gnu)
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13777,7 +13632,7 @@
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      lt_prog_compiler_pic_CXX='+Z'
+ 	    fi
  	    ;;
+-	  aCC)
++	  aCC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+-	    case "$host_cpu" in
++	    case $host_cpu in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+@@ -13731,7 +14059,7 @@
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_static_CXX='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+@@ -13742,18 +14070,24 @@
+ 	;;
+       linux*)
+ 	case $cc_basename in
+-	  KCC)
++	  KCC*)
+ 	    # KAI C++ Compiler
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    lt_prog_compiler_pic_CXX='-fPIC'
+ 	    ;;
+-	  icpc)
++	  icpc* | ecpc*)
+ 	    # Intel C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-static'
+ 	    ;;
+-	  cxx)
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-fpic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  cxx*)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -13770,25 +14104,25 @@
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+-	  cxx)
++	  cxx*)
+ 	    lt_prog_compiler_pic_CXX='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
  	esac
  	;;
 -      netbsd*)
@@ -5221,21 +7708,105 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -13888,11 +13743,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-	  KCC)
++	  KCC*)
+ 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+ 	    ;;
+-	  RCC)
++	  RCC*)
+ 	    # Rational C++ 2.4.1
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+-	  cxx)
++	  cxx*)
+ 	    # Digital/Compaq C++
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+@@ -13804,7 +14138,7 @@
+ 	;;
+       sco*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    lt_prog_compiler_pic_CXX='-fPIC'
+ 	    ;;
+ 	  *)
+@@ -13813,13 +14147,13 @@
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    lt_prog_compiler_wl_CXX='-Qoption ld '
+ 	    ;;
+-	  gcx)
++	  gcx*)
+ 	    # Green Hills C++ Compiler
+ 	    lt_prog_compiler_pic_CXX='-PIC'
+ 	    ;;
+@@ -13829,12 +14163,12 @@
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+-	  CC)
++	  CC*)
+ 	    # Sun C++ 4.x
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    lt_prog_compiler_static_CXX='-Bstatic'
+ 	    ;;
+-	  lcc)
++	  lcc*)
+ 	    # Lucid
+ 	    lt_prog_compiler_pic_CXX='-pic'
+ 	    ;;
+@@ -13844,7 +14178,7 @@
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+-	  NCC)
++	  NCC*)
+ 	    # NonStop-UX NCC 3.20
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    ;;
+@@ -13885,18 +14219,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:13891: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13746: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14225: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:13895: \$? = $ac_status" >&5
-+   echo "$as_me:13750: \$? = $ac_status" >&5
++   echo "$as_me:14229: \$? = $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
-@@ -13939,13 +13794,6 @@
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_CXX=yes
+      fi
+    fi
+@@ -13917,7 +14253,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_CXX=
+@@ -13939,38 +14275,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -5249,26 +7820,35 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -13955,11 +13803,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:13958: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13806: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14287: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:13962: \$? = $ac_status" >&5
-+   echo "$as_me:13810: \$? = $ac_status" >&5
++   echo "$as_me:14291: \$? = $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
-@@ -13969,8 +13817,11 @@
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_CXX=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -5277,17 +7857,19 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14022,6 +13873,9 @@
+@@ -14020,7 +14354,10 @@
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
    cygwin* | mingw*)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
+-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
 +  linux*)
 +    link_all_deplibs_CXX=no
-+  ;;
+   ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -14103,7 +13957,7 @@
+@@ -14103,7 +14440,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5296,7 +7878,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14113,7 +13967,20 @@
+@@ -14113,7 +14450,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5318,7 +7900,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14178,7 +14045,7 @@
+@@ -14178,7 +14528,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5327,8 +7909,17 @@
    ;;
  
  beos*)
-@@ -14203,7 +14070,7 @@
+@@ -14187,7 +14537,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14203,7 +14553,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -5336,34 +7927,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14268,7 +14135,7 @@
+@@ -14215,7 +14565,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -14245,7 +14596,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -14268,7 +14619,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14291,7 +14158,7 @@
+@@ -14291,7 +14642,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14351,7 +14218,7 @@
+@@ -14303,8 +14654,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -14322,7 +14682,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -14349,9 +14709,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14366,7 +14233,7 @@
+@@ -14366,7 +14726,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5372,7 +8014,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14377,7 +14244,7 @@
+@@ -14377,7 +14737,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5381,7 +8023,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14439,22 +14306,19 @@
+@@ -14439,22 +14799,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5403,14 +8045,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14464,6 +14328,30 @@
+@@ -14464,6 +14821,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5441,7 +8083,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14473,7 +14361,7 @@
+@@ -14473,7 +14854,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5450,16 +8092,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14502,7 +14390,7 @@
+@@ -14502,7 +14883,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14522,7 +14410,7 @@
+@@ -14522,7 +14907,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5468,7 +8114,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14751,8 +14639,7 @@
+@@ -14624,8 +15009,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" || \
+-   test -n "$runpath_var CXX" || \
+-   test "X$hardcode_automatic_CXX"="Xyes" ; then
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_CXX" != no &&
+@@ -14751,8 +15136,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5478,7 +8135,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14855,8 +14742,7 @@
+@@ -14855,8 +15239,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5488,7 +8145,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14921,8 +14807,7 @@
+@@ -14921,8 +15304,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5498,7 +8155,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15015,8 +14900,7 @@
+@@ -15015,8 +15397,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5508,7 +8165,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15081,8 +14965,7 @@
+@@ -15081,8 +15462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5518,7 +8175,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15148,8 +15031,7 @@
+@@ -15148,8 +15528,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5528,7 +8185,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15215,8 +15097,7 @@
+@@ -15215,8 +15594,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5538,25 +8195,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15291,7 +15172,7 @@
+@@ -15291,7 +15669,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 15294 "configure"
-+#line 15175 "configure"
++#line 15672 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15389,7 +15270,7 @@
+@@ -15357,7 +15735,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -15389,7 +15767,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 15392 "configure"
-+#line 15273 "configure"
++#line 15770 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15506,7 +15387,8 @@
+@@ -15455,7 +15833,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -15506,7 +15884,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -5566,7 +8241,20 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15636,7 +15518,7 @@
+@@ -15606,6 +15985,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -15636,7 +16021,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -5575,7 +8263,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15667,7 +15549,7 @@
+@@ -15667,7 +16052,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -5584,7 +8272,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15884,7 +15766,10 @@
+@@ -15682,7 +16067,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -15884,7 +16269,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -5596,30 +8293,185 @@
  fi
  
  
-@@ -15986,7 +15871,7 @@
+@@ -15960,12 +16348,35 @@
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ compiler_F77=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ 
+ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+@@ -15978,7 +16389,7 @@
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -15986,8 +16397,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
 -aix4*)
+-  test "$enable_shared" = yes && enable_static=no
 +aix4* | aix5*)
-   test "$enable_shared" = yes && enable_static=no
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
    ;;
  esac
-@@ -16212,11 +16097,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -16064,7 +16477,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -16090,6 +16503,16 @@
+ 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic_F77='-qnocommon'
++         lt_prog_compiler_wl_F77='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -16101,7 +16524,7 @@
+       lt_prog_compiler_wl_F77='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -16125,12 +16548,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_F77='-Wl,'
+ 	lt_prog_compiler_pic_F77='-KPIC'
+ 	lt_prog_compiler_static_F77='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-fpic'
++	lt_prog_compiler_static_F77='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl_F77='-Wl,'
+         # All Alpha code is PIC.
+@@ -16151,9 +16581,14 @@
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl_F77='-Wl,'
+       lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_F77='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_F77='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -16175,6 +16610,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic_F77='-pic'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -16209,18 +16649,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16215: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16100: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16655: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16219: \$? = $ac_status" >&5
-+   echo "$as_me:16104: \$? = $ac_status" >&5
++   echo "$as_me:16659: \$? = $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
-@@ -16263,13 +16148,6 @@
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_F77=yes
+      fi
+    fi
+@@ -16241,7 +16683,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_F77=
+@@ -16263,38 +16705,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -5633,26 +8485,35 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -16279,11 +16157,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16282: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16160: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16717: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16286: \$? = $ac_status" >&5
-+   echo "$as_me:16164: \$? = $ac_status" >&5
++   echo "$as_me:16721: \$? = $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
-@@ -16293,8 +16171,11 @@
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_F77=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -5661,7 +8522,52 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16422,7 +16303,7 @@
+@@ -16365,6 +16805,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -16385,6 +16835,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -16422,7 +16893,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -5670,7 +8576,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16432,13 +16313,13 @@
+@@ -16432,13 +16903,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -5678,7 +8584,8 @@
 +      allow_undefined_flag_F77=unsupported
        always_export_symbols_F77=no
        enable_shared_with_static_runtimes_F77=yes
-       export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -5686,14 +8593,47 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16447,19 +16328,19 @@
+@@ -16447,19 +16918,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
        else
- 	ld_shlibs=no
+-	ld_shlibs=no
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_F77=no
++      else
++	ld_shlibs_F77=no
        fi
        ;;
  
@@ -5710,7 +8650,7 @@
        fi
        ;;
  
-@@ -16477,8 +16358,8 @@
+@@ -16477,8 +16980,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5721,36 +8661,8 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16491,10 +16372,36 @@
-       hardcode_shlibpath_var_F77=no
-       ;;
+@@ -16493,24 +16996,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_F77="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_F77="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs_F77=no
-+    else
-+      ld_shlibs_F77=no
-+    fi
-+    ;;
-+
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -5760,7 +8672,28 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16544,9 +16451,20 @@
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_F77" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_F77=
+-      fi
++    if test "$ld_shlibs_F77" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_F77=
++      export_dynamic_flag_spec_F77=
++      whole_archive_flag_spec_F77=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -16544,9 +17042,20 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -5783,7 +8716,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16592,21 +16510,22 @@
+@@ -16563,7 +17072,7 @@
+       link_all_deplibs_F77=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -16584,6 +17093,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -16592,21 +17104,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -5811,7 +8763,7 @@
        program main
  
        end
-@@ -16620,8 +16539,7 @@
+@@ -16620,8 +17133,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5821,7 +8773,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16648,14 +16566,13 @@
+@@ -16648,14 +17160,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -5839,7 +8791,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16672,8 +16589,7 @@
+@@ -16672,8 +17183,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5849,16 +8801,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16711,7 +16627,7 @@
+@@ -16710,8 +17220,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
 -	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
  	fi
        fi
        ;;
-@@ -16734,13 +16650,13 @@
+@@ -16724,7 +17234,7 @@
+       ld_shlibs_F77=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_F77=-rdynamic
+       ;;
+ 
+@@ -16734,68 +17244,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -5875,78 +8838,114 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_F77='true'
        # FIXME: Should let the user specify the lib program.
-@@ -16754,21 +16670,21 @@
-       archive_cmds_need_lc_F77=no
-       case "$host_os" in
-       rhapsody* | darwin1.[012])
+       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_F77=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
 -	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
-+	allow_undefined_flag_F77='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.012)
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	      ;;
 -	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_F77='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -16777,18 +16693,18 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc_F77=no
        hardcode_direct_F77=no
        hardcode_automatic_F77=yes
        hardcode_shlibpath_var_F77=unsupported
-@@ -16829,8 +16745,8 @@
+-      whole_archive_flag_spec_F77='-all_load $convenience'
++      whole_archive_flag_spec_F77=''
+       link_all_deplibs_F77=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+-      ld_shlibs_F77=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_F77=no
++          ;;
++      esac
+     fi
        ;;
  
+@@ -16829,8 +17339,8 @@
+       ;;
+ 
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16838,7 +16754,7 @@
+@@ -16838,7 +17348,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -5955,9 +8954,12 @@
        else
  	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -16856,10 +16772,10 @@
+@@ -16854,16 +17364,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	case $host_cpu in
  	hppa*64*|ia64*)
 -	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -5968,7 +8970,21 @@
  	  ;;
  	esac
        else
-@@ -16906,7 +16822,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -16873,7 +17383,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
+ 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
+@@ -16906,7 +17416,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -5977,7 +8993,7 @@
        else
  	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16916,7 +16832,7 @@
+@@ -16916,7 +17426,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -5986,16 +9002,17 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -16939,7 +16855,7 @@
+@@ -16939,7 +17449,8 @@
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16949,7 +16865,7 @@
+@@ -16949,7 +17460,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -6004,7 +9021,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16960,14 +16876,14 @@
+@@ -16960,14 +17471,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -6021,7 +9038,7 @@
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
  	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16979,7 +16895,7 @@
+@@ -16979,13 +17490,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -6030,19 +9047,50 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -17004,9 +16920,9 @@
+ 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
+@@ -17004,10 +17515,12 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -17026,7 +16942,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -17016,8 +17529,18 @@
+       hardcode_shlibpath_var_F77=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs_F77=yes
+       ;;
+@@ -17026,7 +17549,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -6051,7 +9099,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17086,9 +17002,9 @@
+@@ -17086,9 +17609,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -6063,7 +9111,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17194,7 +17110,7 @@
+@@ -17194,7 +17717,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -6072,7 +9120,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17204,7 +17120,20 @@
+@@ -17204,7 +17727,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6094,7 +9142,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17269,7 +17198,7 @@
+@@ -17269,7 +17805,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6103,8 +9151,17 @@
    ;;
  
  beos*)
-@@ -17294,7 +17223,7 @@
+@@ -17278,7 +17814,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17294,7 +17830,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -6112,34 +9169,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17359,7 +17288,7 @@
+@@ -17306,7 +17842,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -17336,7 +17873,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -17359,7 +17896,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17382,7 +17311,7 @@
+@@ -17382,7 +17919,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17442,7 +17371,7 @@
+@@ -17394,8 +17931,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -17413,7 +17959,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -17440,9 +17986,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17457,7 +17386,7 @@
+@@ -17457,7 +18003,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -6148,7 +9256,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17468,7 +17397,7 @@
+@@ -17468,7 +18014,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -6157,7 +9265,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17530,22 +17459,19 @@
+@@ -17530,22 +18076,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6179,14 +9287,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17555,6 +17481,30 @@
+@@ -17555,6 +18098,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6217,7 +9325,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17564,7 +17514,7 @@
+@@ -17564,7 +18131,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -6226,16 +9334,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17593,7 +17543,7 @@
+@@ -17593,7 +18160,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17613,7 +17563,7 @@
+@@ -17613,7 +18184,7 @@
  
  os2*)
    libname_spec='$name'
@@ -6244,7 +9356,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17792,7 +17742,8 @@
+@@ -17715,8 +18286,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+-   test -n "$runpath_var F77" || \
+-   test "X$hardcode_automatic_F77"="Xyes" ; then
++   test -n "$runpath_var_F77" || \
++   test "X$hardcode_automatic_F77" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_F77" != no &&
+@@ -17792,7 +18363,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -6254,7 +9377,20 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17922,7 +17873,7 @@
+@@ -17892,6 +18464,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -17922,7 +18500,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -6263,7 +9399,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17953,7 +17904,7 @@
+@@ -17953,7 +18531,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -6272,7 +9408,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18170,7 +18121,10 @@
+@@ -17968,7 +18546,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -18170,7 +18748,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -6284,35 +9429,203 @@
  fi
  
  
-@@ -18252,11 +18206,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+@@ -18203,7 +18784,7 @@
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+@@ -18214,15 +18795,41 @@
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ compiler_GCJ=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ archive_cmds_need_lc_GCJ=no
+ 
++old_archive_cmds_GCJ=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -18249,18 +18856,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18255: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18209: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18862: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18259: \$? = $ac_status" >&5
-+   echo "$as_me:18213: \$? = $ac_status" >&5
++   echo "$as_me:18866: \$? = $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
-@@ -18485,11 +18439,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+    fi
+@@ -18337,7 +18946,7 @@
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -18363,6 +18972,16 @@
+ 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         lt_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+@@ -18374,7 +18993,7 @@
+       lt_prog_compiler_wl_GCJ='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+-      case "$host_cpu" in
++      case $host_cpu in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+@@ -18398,12 +19017,19 @@
+       ;;
+ 
+     linux*)
+-      case $CC in
++      case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_GCJ='-Wl,'
+ 	lt_prog_compiler_pic_GCJ='-KPIC'
+ 	lt_prog_compiler_static_GCJ='-static'
+         ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-fpic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++        ;;
+       ccc*)
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         # All Alpha code is PIC.
+@@ -18424,9 +19050,14 @@
+       ;;
+ 
+     solaris*)
+-      lt_prog_compiler_wl_GCJ='-Wl,'
+       lt_prog_compiler_pic_GCJ='-KPIC'
+       lt_prog_compiler_static_GCJ='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl_GCJ='-Wl,';;
++      esac
+       ;;
+ 
+     sunos4*)
+@@ -18448,6 +19079,11 @@
+       fi
+       ;;
+ 
++    unicos*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++
+     uts4*)
+       lt_prog_compiler_pic_GCJ='-pic'
+       lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18482,18 +19118,20 @@
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18488: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18442: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19124: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18492: \$? = $ac_status" >&5
-+   echo "$as_me:18446: \$? = $ac_status" >&5
++   echo "$as_me:19128: \$? = $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
-@@ -18536,13 +18490,6 @@
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++     $SED '/^$/d' conftest.err >conftest.er2
++     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_GCJ=yes
+      fi
+    fi
+@@ -18514,7 +19152,7 @@
+ fi
+ 
+ fi
+-case "$host_os" in
++case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     lt_prog_compiler_pic_GCJ=
+@@ -18536,38 +19174,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -6326,26 +9639,35 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -18552,11 +18499,11 @@
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18555: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18502: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19186: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18559: \$? = $ac_status" >&5
-+   echo "$as_me:18506: \$? = $ac_status" >&5
++   echo "$as_me:19190: \$? = $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
-@@ -18566,8 +18513,11 @@
+      # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
++     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++     $SED '/^$/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_GCJ=yes
       fi
     fi
-    chmod u+w .
+-   chmod u+w .
 -   $rm conftest* out/*
 -   rmdir out
++   chmod u+w . 2>&5
 +   $rm conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
@@ -6354,7 +9676,52 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18695,7 +18645,7 @@
+@@ -18638,6 +19274,16 @@
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+@@ -18658,6 +19304,27 @@
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
++
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+@@ -18695,7 +19362,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -6363,7 +9730,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18705,13 +18655,13 @@
+@@ -18705,13 +19372,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -6371,7 +9738,8 @@
 +      allow_undefined_flag_GCJ=unsupported
        always_export_symbols_GCJ=no
        enable_shared_with_static_runtimes_GCJ=yes
-       export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -6379,14 +9747,47 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18720,19 +18670,19 @@
+@@ -18720,19 +19387,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
        else
- 	ld_shlibs=no
+-	ld_shlibs=no
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    linux*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	link_all_deplibs_GCJ=no
++      else
++	ld_shlibs_GCJ=no
        fi
        ;;
  
@@ -6403,7 +9804,7 @@
        fi
        ;;
  
-@@ -18750,8 +18700,8 @@
+@@ -18750,8 +19449,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6414,36 +9815,8 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18764,10 +18714,36 @@
-       hardcode_shlibpath_var_GCJ=no
-       ;;
+@@ -18766,24 +19465,19 @@
  
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_GCJ="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-+      fi
-+      link_all_deplibs_GCJ=no
-+    else
-+      ld_shlibs_GCJ=no
-+    fi
-+    ;;
-+
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -6453,7 +9826,28 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18817,9 +18793,20 @@
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs_GCJ" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec_GCJ=
+-      fi
++    if test "$ld_shlibs_GCJ" = no; then
++      runpath_var=
++      hardcode_libdir_flag_spec_GCJ=
++      export_dynamic_flag_spec_GCJ=
++      whole_archive_flag_spec_GCJ=
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -18817,9 +19511,20 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -6476,7 +9870,26 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18865,21 +18852,22 @@
+@@ -18836,7 +19541,7 @@
+       link_all_deplibs_GCJ=yes
+ 
+       if test "$GCC" = yes; then
+-	case $host_os in aix4.012|aix4.012.*)
++	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+@@ -18857,6 +19562,9 @@
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -18865,21 +19573,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -6504,7 +9917,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18903,8 +18891,7 @@
+@@ -18903,8 +19612,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6514,7 +9927,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18931,14 +18918,13 @@
+@@ -18931,14 +19639,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -6532,7 +9945,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18965,8 +18951,7 @@
+@@ -18965,8 +19672,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6542,16 +9955,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19004,7 +18989,7 @@
+@@ -19003,8 +19709,8 @@
+ 	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
 -	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
  	fi
        fi
        ;;
-@@ -19027,13 +19012,13 @@
+@@ -19017,7 +19723,7 @@
+       ld_shlibs_GCJ=no
+       ;;
+ 
+-    bsdi4*)
++    bsdi[45]*)
+       export_dynamic_flag_spec_GCJ=-rdynamic
+       ;;
+ 
+@@ -19027,68 +19733,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -6568,78 +9992,114 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_GCJ='true'
        # FIXME: Should let the user specify the lib program.
-@@ -19047,21 +19032,21 @@
-       archive_cmds_need_lc_GCJ=no
-       case "$host_os" in
-       rhapsody* | darwin1.[012])
+       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_GCJ=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      archive_cmds_need_lc_GCJ=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
 -	allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress'
-+	allow_undefined_flag_GCJ='-undefined suppress'
- 	;;
-       *) # Darwin 1.3 on
+-	;;
+-      *) # Darwin 1.3 on
 -	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	  allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	else
 -	  case ${MACOSX_DEPLOYMENT_TARGET} in
 -	    10.012)
--	      allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
 -	      ;;
 -	    10.*)
--	      allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+-	      allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup'
 -	      ;;
 -	  esac
 -	fi
-+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+      else
-+        case ${MACOSX_DEPLOYMENT_TARGET} in
-+          10.[012])
-+            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-+            ;;
-+          10.*)
-+            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-+            ;;
-+        esac
-+      fi
- 	;;
+-	;;
++      case $host_os in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
        esac
-     	lt_int_apple_cc_single_mod=no
-@@ -19070,18 +19055,18 @@
-     	  lt_int_apple_cc_single_mod=yes
-     	fi
-     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-     	else
+-    	else
 -        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       fi
+-      fi
 -      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         else
+-        else
 -          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-         fi
+-        fi
 -          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      archive_cmds_need_lc_GCJ=no
        hardcode_direct_GCJ=no
        hardcode_automatic_GCJ=yes
        hardcode_shlibpath_var_GCJ=unsupported
-@@ -19122,8 +19107,8 @@
+-      whole_archive_flag_spec_GCJ='-all_load $convenience'
++      whole_archive_flag_spec_GCJ=''
+       link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+-      ld_shlibs_GCJ=no
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
+     fi
        ;;
  
+@@ -19122,8 +19828,8 @@
+       ;;
+ 
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19131,7 +19116,7 @@
+@@ -19131,7 +19837,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -6648,9 +10108,12 @@
        else
  	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -19149,10 +19134,10 @@
+@@ -19147,16 +19853,16 @@
+ 
+     hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case "$host_cpu" in
+-	case "$host_cpu" in
++	case $host_cpu in
  	hppa*64*|ia64*)
 -	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6661,7 +10124,21 @@
  	  ;;
  	esac
        else
-@@ -19199,7 +19184,7 @@
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*|ia64*)
+ 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+@@ -19166,7 +19872,7 @@
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
++	case $host_cpu in
+ 	hppa*64*)
+ 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+ 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
+@@ -19199,7 +19905,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -6670,7 +10147,7 @@
        else
  	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19209,7 +19194,7 @@
+@@ -19209,7 +19915,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -6679,16 +10156,17 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19232,7 +19217,7 @@
+@@ -19232,7 +19938,8 @@
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 -	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
 +	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19242,7 +19227,7 @@
+@@ -19242,7 +19949,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -6697,7 +10175,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19253,14 +19238,14 @@
+@@ -19253,14 +19960,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -6714,7 +10192,7 @@
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
  	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19272,7 +19257,7 @@
+@@ -19272,13 +19979,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -6723,19 +10201,50 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19297,9 +19282,9 @@
+ 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
+@@ -19297,10 +20004,12 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++	wlarc='${wl}'
 +	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
 +	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
++	wlarc=''
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19319,7 +19304,7 @@
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -19309,8 +20018,18 @@
+       hardcode_shlibpath_var_GCJ=no
+       case $host_os in
+       solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++      *)
++ 	# The compiler driver will combine linker options so we
++ 	# cannot just pass the convience library names through
++ 	# without $wl, iff we do not link with $LD.
++ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++ 	case $wlarc in
++ 	'')
++ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++ 	*)
++ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ 	esac ;;
+       esac
+       link_all_deplibs_GCJ=yes
+       ;;
+@@ -19319,7 +20038,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -6744,7 +10253,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19379,9 +19364,9 @@
+@@ -19379,9 +20098,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -6756,7 +10265,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19487,7 +19472,7 @@
+@@ -19487,7 +20206,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -6765,7 +10274,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19497,7 +19482,20 @@
+@@ -19497,7 +20216,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6787,7 +10296,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19562,7 +19560,7 @@
+@@ -19562,7 +20294,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6796,8 +10305,17 @@
    ;;
  
  beos*)
-@@ -19587,7 +19585,7 @@
+@@ -19571,7 +20303,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
  
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19587,7 +20319,7 @@
+ 
  cygwin* | mingw* | pw32*)
    version_type=windows
 -  shrext=".dll"
@@ -6805,34 +10323,85 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19652,7 +19650,7 @@
+@@ -19599,7 +20331,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -19629,7 +20362,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -19652,7 +20385,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19675,7 +19673,7 @@
+@@ -19675,7 +20408,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19735,7 +19733,7 @@
+@@ -19687,8 +20420,17 @@
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -19706,7 +20448,7 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  freebsd3.01* | freebsdelf3.01*)
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+@@ -19733,9 +20475,9 @@
+   version_type=sunos
+   need_lib_prefix=no
    need_version=no
-   case "$host_cpu" in
+-  case "$host_cpu" in
++  case $host_cpu in
    ia64*)
 -    shrext='.so'
 +    shrext_cmds='.so'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19750,7 +19748,7 @@
+@@ -19750,7 +20492,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -6841,7 +10410,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19761,7 +19759,7 @@
+@@ -19761,7 +20503,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -6850,7 +10419,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19823,22 +19821,19 @@
+@@ -19823,22 +20565,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6872,14 +10441,14 @@
  
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -19848,6 +19843,30 @@
+@@ -19848,6 +20587,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6910,7 +10479,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19857,7 +19876,7 @@
+@@ -19857,7 +20620,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -6919,16 +10488,20 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19886,7 +19905,7 @@
+@@ -19886,7 +20649,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
 -  need_version=no
-+  need_version=yes
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -19906,7 +19925,7 @@
+@@ -19906,7 +20673,7 @@
  
  os2*)
    libname_spec='$name'
@@ -6937,7 +10510,18 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -20135,8 +20154,7 @@
+@@ -20008,8 +20775,8 @@
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+ hardcode_action_GCJ=
+ if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+-   test -n "$runpath_var GCJ" || \
+-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
++   test -n "$runpath_var_GCJ" || \
++   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$hardcode_direct_GCJ" != no &&
+@@ -20135,8 +20902,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6947,7 +10531,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20239,8 +20257,7 @@
+@@ -20239,8 +21005,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6957,7 +10541,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20305,8 +20322,7 @@
+@@ -20305,8 +21070,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6967,7 +10551,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20399,8 +20415,7 @@
+@@ -20399,8 +21163,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6977,7 +10561,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20465,8 +20480,7 @@
+@@ -20465,8 +21228,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6987,7 +10571,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20532,8 +20546,7 @@
+@@ -20532,8 +21294,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6997,7 +10581,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20599,8 +20612,7 @@
+@@ -20599,8 +21360,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7007,25 +10591,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20675,7 +20687,7 @@
+@@ -20675,7 +21435,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 20678 "configure"
-+#line 20690 "configure"
++#line 21438 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20773,7 +20785,7 @@
+@@ -20741,7 +21501,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+@@ -20773,7 +21533,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 20776 "configure"
-+#line 20788 "configure"
++#line 21536 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20890,7 +20902,8 @@
+@@ -20839,7 +21599,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+@@ -20890,7 +21650,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -7035,7 +10637,20 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21020,7 +21033,7 @@
+@@ -20990,6 +21751,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21020,7 +21787,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7044,7 +10659,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21051,7 +21064,7 @@
+@@ -21051,7 +21818,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7053,7 +10668,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21268,7 +21281,10 @@
+@@ -21066,7 +21833,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -21268,7 +22035,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -7065,7 +10689,43 @@
  fi
  
  
-@@ -21331,7 +21347,8 @@
+@@ -21311,11 +22081,35 @@
+ compiler=$CC
+ 
+ 
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ compiler_RC=$CC
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
+ lt_cv_prog_compiler_c_o_RC=yes
+ 
+ # The else clause should only fire when bootstrapping the
+@@ -21331,7 +22125,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -7075,7 +10735,20 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21461,7 +21478,7 @@
+@@ -21431,6 +22226,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -21461,7 +22262,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7084,7 +10757,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21492,7 +21509,7 @@
+@@ -21492,7 +22293,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7093,7 +10766,16 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21709,7 +21726,10 @@
+@@ -21507,7 +22308,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -21709,7 +22510,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -7105,7 +10787,7 @@
  fi
  
  
-@@ -21756,7 +21776,7 @@
+@@ -21756,7 +22560,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -7114,7 +10796,7 @@
  
  # Prevent multiple expansion
  
-@@ -21993,8 +22013,7 @@
+@@ -21997,8 +22801,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7124,7 +10806,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22068,9 +22087,6 @@
+@@ -22072,9 +22875,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7134,7 +10816,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22104,8 +22120,7 @@
+@@ -22108,8 +22908,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7144,7 +10826,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22209,8 +22224,7 @@
+@@ -22213,8 +23012,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7154,7 +10836,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22289,9 +22303,6 @@
+@@ -22293,9 +23091,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7164,7 +10846,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22324,8 +22335,7 @@
+@@ -22328,8 +23123,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7174,7 +10856,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22428,8 +22438,7 @@
+@@ -22432,8 +23226,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7184,7 +10866,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22519,8 +22528,7 @@
+@@ -22523,8 +23316,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7194,7 +10876,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22581,8 +22589,7 @@
+@@ -22585,8 +23377,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7204,7 +10886,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22650,8 +22657,7 @@
+@@ -22654,8 +23445,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7214,7 +10896,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22717,8 +22723,7 @@
+@@ -22721,8 +23511,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7224,7 +10906,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22811,8 +22816,7 @@
+@@ -22815,8 +23604,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7234,7 +10916,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22890,8 +22894,7 @@
+@@ -22894,8 +23682,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7244,7 +10926,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22975,8 +22978,7 @@
+@@ -22979,8 +23766,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7254,7 +10936,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23044,8 +23046,7 @@
+@@ -23048,8 +23834,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7264,7 +10946,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23140,8 +23141,7 @@
+@@ -23144,8 +23929,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7274,7 +10956,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23205,8 +23205,7 @@
+@@ -23209,8 +23993,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7284,7 +10966,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23301,8 +23300,7 @@
+@@ -23305,8 +24088,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7294,7 +10976,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23366,8 +23364,7 @@
+@@ -23370,8 +24152,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7304,7 +10986,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23463,8 +23460,7 @@
+@@ -23467,8 +24248,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7314,7 +10996,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23528,8 +23524,7 @@
+@@ -23532,8 +24312,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7324,7 +11006,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23626,8 +23621,7 @@
+@@ -23630,8 +24409,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7334,7 +11016,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23692,8 +23686,7 @@
+@@ -23696,8 +24474,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7344,7 +11026,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23761,8 +23754,7 @@
+@@ -23765,8 +24542,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7354,7 +11036,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23913,8 +23905,7 @@
+@@ -23917,8 +24693,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7364,7 +11046,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24069,8 +24060,7 @@
+@@ -24073,8 +24848,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7374,7 +11056,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24135,8 +24125,7 @@
+@@ -24139,8 +24913,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7384,7 +11066,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24283,8 +24272,7 @@
+@@ -24287,8 +25060,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7394,7 +11076,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24439,8 +24427,7 @@
+@@ -24443,8 +25215,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7404,7 +11086,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24496,9 +24483,6 @@
+@@ -24500,9 +25271,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7414,7 +11096,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24532,8 +24516,7 @@
+@@ -24536,8 +25304,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7424,7 +11106,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24637,8 +24620,7 @@
+@@ -24641,8 +25408,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7434,7 +11116,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24738,8 +24720,7 @@
+@@ -24742,8 +25508,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7444,7 +11126,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24813,8 +24794,7 @@
+@@ -24817,8 +25582,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7454,7 +11136,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24877,8 +24857,7 @@
+@@ -24881,8 +25645,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7464,7 +11146,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24940,8 +24919,7 @@
+@@ -24944,8 +25707,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7474,7 +11156,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24981,8 +24959,7 @@
+@@ -24985,8 +25747,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7484,7 +11166,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25038,8 +25015,7 @@
+@@ -25042,8 +25803,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7494,7 +11176,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25079,8 +25055,7 @@
+@@ -25083,8 +25843,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7504,7 +11186,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25144,8 +25119,7 @@
+@@ -25148,8 +25907,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7514,7 +11196,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25176,10 +25150,8 @@
+@@ -25180,10 +25938,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7527,7 +11209,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25290,8 +25262,7 @@
+@@ -25294,8 +26050,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7537,7 +11219,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25353,8 +25324,7 @@
+@@ -25357,8 +26112,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7547,7 +11229,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25394,8 +25364,7 @@
+@@ -25398,8 +26152,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7557,7 +11239,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25451,8 +25420,7 @@
+@@ -25455,8 +26208,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7567,7 +11249,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25492,8 +25460,7 @@
+@@ -25496,8 +26248,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7577,7 +11259,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25557,8 +25524,7 @@
+@@ -25561,8 +26312,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7587,7 +11269,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25589,10 +25555,8 @@
+@@ -25593,10 +26343,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7600,7 +11282,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25703,8 +25667,7 @@
+@@ -25707,8 +26455,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7610,7 +11292,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25766,8 +25729,7 @@
+@@ -25770,8 +26517,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7620,7 +11302,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25807,8 +25769,7 @@
+@@ -25811,8 +26557,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7630,7 +11312,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25864,8 +25825,7 @@
+@@ -25868,8 +26613,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7640,7 +11322,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25905,8 +25865,7 @@
+@@ -25909,8 +26653,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7650,7 +11332,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25970,8 +25929,7 @@
+@@ -25974,8 +26717,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7660,7 +11342,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26002,10 +25960,8 @@
+@@ -26006,10 +26748,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7673,7 +11355,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26116,8 +26072,7 @@
+@@ -26120,8 +26860,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7683,7 +11365,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26179,8 +26134,7 @@
+@@ -26183,8 +26922,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7693,7 +11375,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26220,8 +26174,7 @@
+@@ -26224,8 +26962,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7703,7 +11385,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26277,8 +26230,7 @@
+@@ -26281,8 +27018,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7713,7 +11395,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26318,8 +26270,7 @@
+@@ -26322,8 +27058,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7723,7 +11405,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26383,8 +26334,7 @@
+@@ -26387,8 +27122,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7733,7 +11415,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26415,10 +26365,8 @@
+@@ -26419,10 +27153,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7746,7 +11428,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26537,8 +26485,7 @@
+@@ -26541,8 +27273,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7756,7 +11438,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26609,8 +26556,7 @@
+@@ -26613,8 +27344,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7766,7 +11448,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26680,8 +26626,7 @@
+@@ -26684,8 +27414,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7776,7 +11458,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26743,8 +26688,7 @@
+@@ -26747,8 +27476,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7786,7 +11468,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26784,8 +26728,7 @@
+@@ -26788,8 +27516,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7796,7 +11478,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26841,8 +26784,7 @@
+@@ -26845,8 +27572,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7806,7 +11488,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26882,8 +26824,7 @@
+@@ -26886,8 +27612,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7816,7 +11498,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26947,8 +26888,7 @@
+@@ -26951,8 +27676,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7826,7 +11508,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26979,10 +26919,8 @@
+@@ -26983,10 +27707,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7839,7 +11521,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27094,8 +27032,7 @@
+@@ -27098,8 +27820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7849,7 +11531,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27157,8 +27094,7 @@
+@@ -27161,8 +27882,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7859,7 +11541,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27198,8 +27134,7 @@
+@@ -27202,8 +27922,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7869,7 +11551,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27255,8 +27190,7 @@
+@@ -27259,8 +27978,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7879,7 +11561,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27296,8 +27230,7 @@
+@@ -27300,8 +28018,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7889,7 +11571,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27361,8 +27294,7 @@
+@@ -27365,8 +28082,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7899,7 +11581,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27393,10 +27325,8 @@
+@@ -27397,10 +28113,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7912,7 +11594,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27507,8 +27437,7 @@
+@@ -27511,8 +28225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7922,17 +11604,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27578,8 +27507,7 @@
+@@ -27593,8 +28306,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27694,8 +28406,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27759,8 +27687,7 @@
+@@ -27875,8 +28586,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7942,7 +11634,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27869,8 +27796,7 @@
+@@ -27985,8 +28695,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7952,7 +11644,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28094,8 +28020,7 @@
+@@ -28210,8 +28919,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7962,7 +11654,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28318,8 +28243,7 @@
+@@ -28434,8 +29142,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7972,7 +11664,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28395,8 +28319,7 @@
+@@ -28511,8 +29218,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7982,7 +11674,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28622,8 +28545,7 @@
+@@ -28738,8 +29444,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7992,7 +11684,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28698,8 +28620,7 @@
+@@ -28814,8 +29519,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8002,7 +11694,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28759,8 +28680,7 @@
+@@ -28875,8 +29579,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8012,7 +11704,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28843,8 +28763,7 @@
+@@ -28959,8 +29662,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8022,7 +11714,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28937,8 +28856,7 @@
+@@ -29053,8 +29755,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8032,7 +11724,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29112,8 +29030,7 @@
+@@ -29228,8 +29929,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8042,7 +11734,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29211,8 +29128,7 @@
+@@ -29327,8 +30027,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8052,7 +11744,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29305,8 +29221,7 @@
+@@ -29415,8 +30114,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8062,7 +11754,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29389,8 +29304,7 @@
+@@ -29493,8 +30191,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8072,25 +11764,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29443,7 +29357,7 @@
+@@ -29547,7 +30244,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29446: $i/$j" >&5
-+    echo "configure: 29360: $i/$j" >&5
+-    echo "configure: 29550: $i/$j" >&5
++    echo "configure: 30247: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29746,7 +29660,7 @@
+@@ -29845,7 +30542,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29749: $i/$j" >&5
-+    echo "configure: 29663: $i/$j" >&5
+-    echo "configure: 29848: $i/$j" >&5
++    echo "configure: 30545: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30423,8 +30337,7 @@
+@@ -30522,8 +31219,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8100,43 +11792,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30583,7 +30496,7 @@
+@@ -30682,7 +31378,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30586: $i/$j" >&5
-+    echo "configure: 30499: $i/$j" >&5
+-    echo "configure: 30685: $i/$j" >&5
++    echo "configure: 31381: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30613,7 +30526,7 @@
+@@ -30712,7 +31408,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30616: $i/$j" >&5
-+    echo "configure: 30529: $i/$j" >&5
+-    echo "configure: 30715: $i/$j" >&5
++    echo "configure: 31411: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30631,7 +30544,7 @@
+@@ -30730,7 +31426,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30634: $i/$j" >&5
-+    echo "configure: 30547: $i/$j" >&5
+-    echo "configure: 30733: $i/$j" >&5
++    echo "configure: 31429: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32149,7 +32062,7 @@
+@@ -32253,7 +32949,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32152: $i/$j" >&5
-+    echo "configure: 32065: $i/$j" >&5
+-    echo "configure: 32256: $i/$j" >&5
++    echo "configure: 32952: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32341,8 +32254,7 @@
+@@ -32451,8 +33147,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8146,7 +11838,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32414,8 +32326,7 @@
+@@ -32524,8 +33219,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8156,7 +11848,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32469,8 +32380,7 @@
+@@ -32579,8 +33273,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8166,7 +11858,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32541,8 +32451,7 @@
+@@ -32651,8 +33344,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8176,7 +11868,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32596,8 +32505,7 @@
+@@ -32706,8 +33398,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8186,7 +11878,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32664,8 +32572,7 @@
+@@ -32774,8 +33465,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8196,7 +11888,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32849,8 +32756,7 @@
+@@ -32959,8 +33649,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8206,7 +11898,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33000,8 +32906,7 @@
+@@ -33110,8 +33799,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8216,7 +11908,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33187,8 +33092,7 @@
+@@ -33297,8 +33985,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8226,7 +11918,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33308,8 +33212,7 @@
+@@ -33418,8 +34105,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8236,7 +11928,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33378,8 +33281,7 @@
+@@ -33488,8 +34174,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8246,7 +11938,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33553,8 +33455,7 @@
+@@ -33577,8 +34262,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8256,7 +11948,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33706,8 +33607,7 @@
+@@ -33670,8 +34354,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8266,17 +11958,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33859,8 +33759,7 @@
+@@ -33750,8 +34433,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33930,8 +33829,7 @@
+@@ -33920,8 +34602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8286,7 +11978,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34001,8 +33899,7 @@
+@@ -34003,8 +34684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8296,25 +11988,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34071,7 +33968,7 @@
- do
-   for j in vorbis/codec.h;
-   do
--    echo "configure: 34074: $i/$j" >&5
-+    echo "configure: 33971: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       vorbis_incdir=$i
-@@ -34095,7 +33992,7 @@
- do
-   for j in libvorbis.$ext;
-   do
--    echo "configure: 34098: $i/$j" >&5
-+    echo "configure: 33995: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       vorbis_libdir=$i
-@@ -34151,8 +34048,7 @@
+@@ -34086,8 +34766,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8324,7 +11998,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34223,8 +34119,7 @@
+@@ -34169,8 +34848,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8334,7 +12008,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34401,8 +34296,7 @@
+@@ -34310,8 +34988,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8344,27 +12018,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34504,8 +34398,7 @@
+@@ -34465,8 +35142,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -34674,8 +34567,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34748,8 +34640,7 @@
+@@ -34562,8 +35238,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8374,57 +12038,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35060,8 +34951,7 @@
+@@ -34717,8 +35392,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -35216,8 +35106,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -35332,8 +35221,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -35488,8 +35376,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -35598,8 +35485,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35671,8 +35557,7 @@
+@@ -34797,8 +35471,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8434,7 +12058,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35752,8 +35637,7 @@
+@@ -34856,8 +35529,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8444,7 +12068,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35825,8 +35709,7 @@
+@@ -34915,8 +35587,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8454,17 +12078,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35939,8 +35822,7 @@
+@@ -35108,8 +35779,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36011,8 +35893,7 @@
+@@ -35278,8 +35948,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8474,7 +12098,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36121,8 +36002,7 @@
+@@ -35322,7 +35991,7 @@
+ do
+   for j in libcdda_paranoia.$ext;
+   do
+-    echo "configure: 35325: $i/$j" >&5
++    echo "configure: 35994: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       para_libdir=$i
+@@ -35461,8 +36130,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8484,37 +12117,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36280,8 +36160,7 @@
+@@ -35631,8 +36299,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -36382,8 +36261,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36547,8 +36425,7 @@
+@@ -35808,8 +36475,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36614,8 +36491,7 @@
+@@ -36306,8 +36972,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8524,7 +12147,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36687,8 +36563,7 @@
+@@ -36468,8 +37133,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8534,37 +12157,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36765,8 +36640,7 @@
+@@ -36654,8 +37318,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -36921,8 +36795,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -37121,8 +36994,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37280,8 +37152,7 @@
+@@ -37094,8 +37757,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8574,7 +12177,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37407,8 +37278,7 @@
+@@ -37265,8 +37927,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8584,177 +12187,37 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37483,8 +37353,7 @@
+@@ -37393,8 +38054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37544,8 +37413,7 @@
+@@ -37549,8 +38209,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -37619,8 +37487,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -37687,8 +37554,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -37755,8 +37621,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -37823,8 +37688,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -37897,8 +37761,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38260,8 +38123,7 @@
+@@ -37665,8 +38324,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38426,8 +38288,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38488,8 +38349,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38550,8 +38410,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38618,8 +38477,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38699,8 +38557,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38780,8 +38637,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38879,8 +38735,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39041,8 +38896,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39210,8 +39064,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39606,8 +39459,7 @@
+@@ -37821,8 +38479,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8764,63 +12227,17 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39803,7 +39655,7 @@
- do
-   for j in cdda_interface.h;
-   do
--    echo "configure: 39806: $i/$j" >&5
-+    echo "configure: 39658: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       para_incdir=$i
-@@ -39826,7 +39678,7 @@
- do
-   for j in libcdda_paranoia.$ext;
-   do
--    echo "configure: 39829: $i/$j" >&5
-+    echo "configure: 39681: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       para_libdir=$i
-@@ -39946,7 +39798,7 @@
- do
-   for j in lame/lame.h;
-   do
--    echo "configure: 39949: $i/$j" >&5
-+    echo "configure: 39801: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       lame_incdir=$i
-@@ -39968,7 +39820,7 @@
- do
-   for j in libmp3lame.$ext;
-   do
--    echo "configure: 39971: $i/$j" >&5
-+    echo "configure: 39823: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       lame_libdir=$i
-@@ -40143,8 +39995,7 @@
+@@ -37929,8 +38586,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -40253,8 +40104,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40412,8 +40262,7 @@
+@@ -38093,8 +38749,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8830,7 +12247,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40476,8 +40325,7 @@
+@@ -38155,8 +38810,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8840,7 +12257,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40569,8 +40417,7 @@
+@@ -38216,8 +38870,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8850,7 +12267,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40631,8 +40478,7 @@
+@@ -38279,8 +38932,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8860,7 +12277,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40692,8 +40538,7 @@
+@@ -38341,8 +38993,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8870,7 +12287,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40755,8 +40600,7 @@
+@@ -38403,8 +39054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8880,7 +12297,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40817,8 +40661,7 @@
+@@ -38536,8 +39186,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8890,7 +12307,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40879,8 +40722,7 @@
+@@ -38686,8 +39335,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8900,7 +12317,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41012,8 +40854,7 @@
+@@ -38743,8 +39391,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8910,7 +12327,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41162,8 +41003,7 @@
+@@ -38892,8 +39539,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8920,7 +12337,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41219,8 +41059,7 @@
+@@ -38994,8 +39640,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8930,7 +12347,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41368,8 +41207,7 @@
+@@ -39145,8 +39790,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8940,7 +12357,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41470,8 +41308,7 @@
+@@ -39298,8 +39942,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8950,7 +12367,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41621,8 +41458,7 @@
+@@ -39341,8 +39984,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8960,7 +12377,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41774,8 +41610,7 @@
+@@ -39399,8 +40041,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8970,7 +12387,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41817,8 +41652,7 @@
+@@ -39530,8 +40171,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8980,7 +12397,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41875,8 +41709,7 @@
+@@ -39609,8 +40249,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8990,7 +12407,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42006,8 +41839,7 @@
+@@ -39673,8 +40312,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9000,7 +12417,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42085,8 +41917,7 @@
+@@ -39737,8 +40375,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9010,7 +12427,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42149,8 +41980,7 @@
+@@ -39801,8 +40438,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9020,67 +12437,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42213,8 +42043,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42277,8 +42106,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42358,8 +42186,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42421,8 +42248,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42496,8 +42322,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42559,8 +42384,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42614,14 +42438,6 @@
+@@ -39856,14 +40492,6 @@
  echo "${ECHO_T}$OS_TYPE" >&6
  
  INTELCPPFLAG=
@@ -9095,7 +12452,7 @@
  
  
  
-@@ -42712,8 +42528,7 @@
+@@ -39954,8 +40582,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9105,7 +12462,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42788,8 +42603,7 @@
+@@ -40030,8 +40657,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9115,7 +12472,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42849,8 +42663,7 @@
+@@ -40091,8 +40717,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9125,7 +12482,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43144,8 +42957,7 @@
+@@ -40389,8 +41014,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9135,7 +12492,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43217,8 +43029,7 @@
+@@ -40462,8 +41086,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9145,7 +12502,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43272,8 +43083,7 @@
+@@ -40517,8 +41140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9155,7 +12512,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43344,8 +43154,7 @@
+@@ -40589,8 +41211,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9165,7 +12522,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43399,8 +43208,7 @@
+@@ -40644,8 +41265,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9175,7 +12532,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43467,8 +43275,7 @@
+@@ -40712,8 +41332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9185,7 +12542,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43633,8 +43440,7 @@
+@@ -40878,8 +41497,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9195,7 +12552,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43703,8 +43509,7 @@
+@@ -40948,8 +41566,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9205,7 +12562,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43888,8 +43693,7 @@
+@@ -41133,8 +41750,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9215,7 +12572,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43983,8 +43787,7 @@
+@@ -41228,8 +41844,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9225,7 +12582,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44070,8 +43873,7 @@
+@@ -41315,8 +41930,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9235,7 +12592,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44175,8 +43977,7 @@
+@@ -41420,8 +42034,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9245,7 +12602,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44462,8 +44263,7 @@
+@@ -41718,8 +42331,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9255,7 +12612,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44587,8 +44387,7 @@
+@@ -41841,8 +42453,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9265,7 +12622,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45320,6 +45119,13 @@
+@@ -42557,6 +43168,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -9279,7 +12636,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -46399,6 +46205,9 @@
+@@ -43559,6 +44177,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -9289,7 +12646,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46894,11 +46703,6 @@
+@@ -44024,11 +44645,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -9301,7 +12658,7 @@
    # 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.  */
-@@ -46937,6 +46741,12 @@
+@@ -44067,6 +44683,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -9316,16 +12673,18 @@
    sed "$ac_vpsub
 --- configure.in
 +++ configure.in
-@@ -42,6 +42,8 @@
+@@ -40,7 +40,9 @@
+ AC_ARG_PROGRAM
+ 
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdemultimedia, "3.4.3") dnl searches for some needed programs
+-AM_INIT_AUTOMAKE(kdemultimedia, "3.5") dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kdemultimedia-rc1, "3.5") dnl searches for some needed programs
++
++AM_MAINTAINER_MODE
  
-+AM_MAINTAINER_MODE
-+
  KDE_SET_PREFIX
  
- dnl generate the config header
-@@ -1909,12 +1911,6 @@
+@@ -1230,12 +1232,6 @@
  AC_MSG_RESULT($OS_TYPE)
  
  INTELCPPFLAG=
@@ -9340,17 +12699,17 @@
  AC_DEFUN([KDE_MPEGLIB_COMPILES],
 --- doc/artsbuilder/images/Makefile.in
 +++ doc/artsbuilder/images/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9359,7 +12718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9371,7 +12730,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,28 +639,28 @@
+@@ -606,28 +609,28 @@
  .NOEXPORT:
  
  #>+ 2
@@ -9407,17 +12766,17 @@
  
 --- doc/artsbuilder/Makefile.in
 +++ doc/artsbuilder/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -440,7 +443,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -9426,7 +12785,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9438,7 +12797,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -803,10 +806,10 @@
+@@ -773,10 +776,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -9451,7 +12810,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -833,20 +836,20 @@
+@@ -803,20 +806,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder
@@ -9477,17 +12836,17 @@
  
 --- doc/juk/Makefile.in
 +++ doc/juk/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9496,7 +12855,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9508,7 +12867,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,10 +639,10 @@
+@@ -606,10 +609,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -9521,7 +12880,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -666,20 +669,20 @@
+@@ -636,20 +639,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
@@ -9547,17 +12906,17 @@
  
 --- doc/kaboodle/Makefile.in
 +++ doc/kaboodle/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9566,7 +12925,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9578,7 +12937,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,7 +639,7 @@
+@@ -606,7 +609,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -9587,19 +12946,19 @@
  
  #>+ 24
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
---- doc/kcontrol/kmixcfg/Makefile.in
-+++ doc/kcontrol/kmixcfg/Makefile.in
-@@ -201,6 +201,9 @@
+--- doc/kioslave/Makefile.in
++++ doc/kioslave/Makefile.in
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9608,7 +12967,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9620,94 +12979,19 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,7 +639,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am 
-+KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2 
- 
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
---- doc/kcontrol/Makefile.in
-+++ doc/kcontrol/Makefile.in
-@@ -217,6 +217,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- doc/kio_audiocd/Makefile.in
-+++ doc/kio_audiocd/Makefile.in
-@@ -201,6 +201,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- doc/kmid/Makefile.in
 +++ doc/kmid/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9716,7 +13000,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9728,7 +13012,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,7 +639,7 @@
+@@ -606,7 +609,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -9739,17 +13023,17 @@
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
 --- doc/kmix/Makefile.in
 +++ doc/kmix/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9758,7 +13042,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9770,7 +13054,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,10 +639,10 @@
+@@ -606,10 +609,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -9783,7 +13067,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -666,20 +669,20 @@
+@@ -636,20 +639,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix
@@ -9809,17 +13093,17 @@
  
 --- doc/krec/Makefile.in
 +++ doc/krec/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9828,7 +13112,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9840,7 +13124,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,10 +639,10 @@
+@@ -606,10 +609,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -9853,7 +13137,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -666,20 +669,20 @@
+@@ -636,20 +639,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec
@@ -9879,17 +13163,17 @@
  
 --- doc/kscd/Makefile.in
 +++ doc/kscd/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -9898,7 +13182,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9910,61 +13194,61 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,10 +639,10 @@
+@@ -606,10 +609,10 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png kscdannounc.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd9.png kscd19.png kscd3.png kscd.png Makefile.in Makefile.am 
-+KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am kscdannounc.png index.cache.bz2 
+-KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd19.png kscd9.png kscd3.png kscd.png Makefile.in Makefile.am 
++KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am index.cache.bz2 
  
  #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook 
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -666,20 +669,20 @@
+@@ -636,20 +639,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
--	@for base in index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png ; do \
-+	@for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
+-	@for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++	@for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
  	done
  
  uninstall-nls:
--	for base in index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png ; do \
-+	for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
+-	for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++	for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
  	done
  
  
  #>+ 5
  distdir-nls:
--	for file in index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png ; do \
-+	for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
+-	for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
++	for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/Makefile.in
 +++ doc/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -464,13 +467,13 @@
+@@ -434,13 +437,13 @@
  KDE_DOCS = AUTO
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
--SUBDIRS =. artsbuilder kaboodle kmid krec kscd noatun kmix juk kio_audiocd kcontrol
-+SUBDIRS =. juk kmid kmix krec kscd kaboodle kio_audiocd kcontrol artsbuilder noatun
+-SUBDIRS =. artsbuilder kaboodle kmid krec kscd noatun kmix juk kioslave
++SUBDIRS =. juk kmid kmix krec kscd kaboodle kioslave artsbuilder noatun
  #>- all: all-recursive
  #>+ 1
  all: docs-am  all-recursive
@@ -9975,7 +13259,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9989,17 +13273,17 @@
  mostlyclean-libtool:
 --- doc/noatun/Makefile.in
 +++ doc/noatun/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10008,7 +13292,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10020,7 +13304,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -636,7 +639,7 @@
+@@ -606,7 +609,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -10031,17 +13315,17 @@
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
 --- juk/Makefile.in
 +++ juk/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -321,6 +321,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -730,7 +733,7 @@
+@@ -712,7 +715,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10050,7 +13334,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -768,9 +771,9 @@
+@@ -750,9 +753,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10062,7 +13346,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1274,18 +1277,18 @@
+@@ -1259,18 +1262,18 @@
  mocs: collectionlist.moc
  
  #>+ 3
@@ -10087,7 +13371,7 @@
  
  #>+ 3
  artsplayer.moc: $(srcdir)/artsplayer.h
-@@ -1295,18 +1298,18 @@
+@@ -1280,18 +1283,18 @@
  mocs: artsplayer.moc
  
  #>+ 3
@@ -10112,7 +13396,7 @@
  
  #>+ 3
  directorylist.moc: $(srcdir)/directorylist.h
-@@ -1435,18 +1438,18 @@
+@@ -1427,18 +1430,18 @@
  mocs: searchwidget.moc
  
  #>+ 3
@@ -10137,87 +13421,59 @@
  
  #>+ 3
  playlistbox.moc: $(srcdir)/playlistbox.h
-@@ -1456,18 +1459,18 @@
- mocs: playlistbox.moc
+@@ -1519,10 +1522,10 @@
  
  #>+ 3
--folderplaylist.moc: $(srcdir)/folderplaylist.h
--	$(MOC) $(srcdir)/folderplaylist.h -o folderplaylist.moc
-+filerenamer.moc: $(srcdir)/filerenamer.h
-+	$(MOC) $(srcdir)/filerenamer.h -o filerenamer.moc
- 
- #>+ 2
--mocs: folderplaylist.moc
-+mocs: filerenamer.moc
- 
- #>+ 3
--filerenamer.moc: $(srcdir)/filerenamer.h
--	$(MOC) $(srcdir)/filerenamer.h -o filerenamer.moc
-+folderplaylist.moc: $(srcdir)/folderplaylist.h
-+	$(MOC) $(srcdir)/folderplaylist.h -o folderplaylist.moc
- 
- #>+ 2
--mocs: filerenamer.moc
-+mocs: folderplaylist.moc
- 
- #>+ 3
- gstreamerplayer.moc: $(srcdir)/gstreamerplayer.h
-@@ -1527,10 +1530,10 @@
- 
- #>+ 3
  clean-metasources:
--	-rm -f  collectionlist.moc googlefetcherdialog.moc deletedialog.moc artsplayer.moc googlefetcher.moc viewmode.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc tagtransactionmanager.moc keydialog.moc playlistbox.moc folderplaylist.moc filerenamer.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
-+	-rm -f  collectionlist.moc deletedialog.moc googlefetcherdialog.moc artsplayer.moc viewmode.moc googlefetcher.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc keydialog.moc tagtransactionmanager.moc playlistbox.moc filerenamer.moc folderplaylist.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
+-	-rm -f  collectionlist.moc googlefetcherdialog.moc deletedialog.moc artsplayer.moc googlefetcher.moc viewmode.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc coverdialog.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc tagtransactionmanager.moc keydialog.moc playlistbox.moc folderplaylist.moc filerenamer.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
++	-rm -f  collectionlist.moc deletedialog.moc googlefetcherdialog.moc artsplayer.moc viewmode.moc googlefetcher.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc coverdialog.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc keydialog.moc tagtransactionmanager.moc playlistbox.moc folderplaylist.moc filerenamer.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
  
  #>+ 2
--KDE_DIST=jukui.rc cr32-app-juk.png trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h playlistitem.h stringhash.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h tageditor.h player.h viewmode.h directorylist.h googlefetcherdialog.h Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h tagguesserconfigdlgwidget.ui cr16-app-juk.png configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h filerenamerbase.ui nowplaying.h HACKING playlistcollection.h searchwidget.h playlistsearch.h cr128-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h cr64-app-juk.png tag.h playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in dynamicplaylist.h splashscreen.h exampleoptions.h cache.h deletedialog.h folderplaylist.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h searchplaylist.h cr48-app-juk.png Makefile.am historyplaylist.h 
-+KDE_DIST=jukui.rc cr32-app-juk.png trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h stringhash.h playlistitem.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h player.h tageditor.h viewmode.h directorylist.h googlefetcherdialog.h Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h cr16-app-juk.png tagguesserconfigdlgwidget.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h nowplaying.h filerenamerbase.ui HACKING playlistcollection.h searchwidget.h playlistsearch.h cr128-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h tag.h cr64-app-juk.png playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in splashscreen.h dynamicplaylist.h exampleoptions.h cache.h deletedialog.h folderplaylist.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h searchplaylist.h cr48-app-juk.png Makefile.am historyplaylist.h 
+-KDE_DIST=jukui.rc trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h hi48-app-juk.png ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h playlistitem.h stringhash.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h tageditor.h player.h viewmode.h directorylist.h googlefetcherdialog.h hi16-app-juk.png Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h hi128-app-juk.png tagguesserconfigdlgwidget.ui coverdialogbase.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h filerenamerbase.ui nowplaying.h HACKING playlistcollection.h searchwidget.h coverdialog.h playlistsearch.h hi64-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h tag.h playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in dynamicplaylist.h splashscreen.h exampleoptions.h cache.h deletedialog.h covermanager.h folderplaylist.h covericonview.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h hi32-app-juk.png searchplaylist.h Makefile.am historyplaylist.h 
++KDE_DIST=jukui.rc trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h hi48-app-juk.png ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h stringhash.h playlistitem.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h player.h tageditor.h viewmode.h directorylist.h googlefetcherdialog.h hi16-app-juk.png Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h hi128-app-juk.png tagguesserconfigdlgwidget.ui coverdialogbase.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h nowplaying.h filerenamerbase.ui HACKING playlistcollection.h searchwidget.h playlistsearch.h coverdialog.h hi64-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h tag.h playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in splashscreen.h dynamicplaylist.h exampleoptions.h cache.h deletedialog.h covermanager.h folderplaylist.h playlistsplitter.h covericonview.h playermanager.h collectionlist.h trackpickerdialog.h hi32-app-juk.png searchplaylist.h Makefile.am historyplaylist.h 
  
  #>+ 4
  clean-idl:
-@@ -1555,23 +1558,23 @@
+@@ -1546,6 +1549,8 @@
+ 
+ #>+ 22
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-juk_dock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/juk_dock.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/juk.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/juk.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+@@ -1556,16 +1561,14 @@
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/juk.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/juk.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-juk.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
  
  uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/juk.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/juk.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/juk_dock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/juk.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/juk.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/juk.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/juk.png
  
  #>+ 15
+ force-reedit:
 --- juk/pics/Makefile.in
 +++ juk/pics/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -431,7 +434,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10226,7 +13482,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10240,17 +13496,17 @@
  mostlyclean-libtool:
 --- kaboodle/actions/Makefile.in
 +++ kaboodle/actions/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10259,7 +13515,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10271,7 +13527,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -641,14 +644,14 @@
+@@ -611,14 +614,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -10291,17 +13547,17 @@
  force-reedit:
 --- kaboodle/Makefile.in
 +++ kaboodle/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -282,6 +282,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -535,7 +538,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10310,7 +13566,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -573,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10322,7 +13578,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1085,20 +1088,6 @@
+@@ -1055,20 +1058,6 @@
  .NOEXPORT:
  
  #>+ 3
@@ -10343,7 +13599,7 @@
  userinterface.moc: $(srcdir)/userinterface.h
  	$(MOC) $(srcdir)/userinterface.h -o userinterface.moc
  
-@@ -1120,13 +1109,6 @@
+@@ -1090,13 +1079,6 @@
  mocs: kaboodle_factory.moc
  
  #>+ 3
@@ -10357,7 +13613,7 @@
  player.moc: $(srcdir)/player.h
  	$(MOC) $(srcdir)/player.h -o player.moc
  
-@@ -1140,6 +1122,27 @@
+@@ -1110,6 +1092,27 @@
  #>+ 2
  mocs: conf.moc
  
@@ -10385,7 +13641,7 @@
  #>+ 8
  libkaboodlepart.la.closure: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
  	@echo "int main() {return 0;}" > libkaboodlepart_la_closure.cpp
-@@ -1151,10 +1154,10 @@
+@@ -1121,10 +1124,10 @@
  
  #>+ 3
  clean-metasources:
@@ -10398,7 +13654,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1202,7 +1205,7 @@
+@@ -1172,7 +1175,7 @@
  
  
  #>+ 11
@@ -10407,7 +13663,7 @@
  	@echo 'creating libkaboodle_noinst_la.all_cpp.cpp ...'; \
  	rm -f libkaboodle_noinst_la.all_cpp.files libkaboodle_noinst_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkaboodle_noinst_la.all_cpp.final; \
-@@ -1264,8 +1267,8 @@
+@@ -1230,8 +1233,8 @@
  kaboodle_factory.lo: kaboodle_factory.moc 
  nmcheck: 
  conf.o: conf.moc 
@@ -10419,17 +13675,17 @@
  userinterface.o: userinterface.moc 
 --- kaboodle/pics/Makefile.in
 +++ kaboodle/pics/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -420,7 +423,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10438,7 +13694,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10450,55 +13706,55 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -640,26 +643,26 @@
+@@ -610,26 +613,26 @@
  
  #>+ 22
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaboodle.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kaboodle.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kaboodle.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaboodle.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kaboodle.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kaboodle.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kaboodle.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kaboodle.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaboodle.png
  
  #>+ 15
  force-reedit:
 --- kappfinder-data/Makefile.in
 +++ kappfinder-data/Makefile.in
-@@ -216,6 +216,9 @@
+@@ -209,6 +209,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -483,13 +486,13 @@
+@@ -453,13 +456,13 @@
  EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
  xdg_directory_DATA = kde-multimedia-music.directory
  xdg_mergedmenu_DATA = kde-multimedia-music.menu
@@ -10514,7 +13770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -497,9 +500,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10528,17 +13784,17 @@
  mostlyclean-libtool:
 --- kaudiocreator/icons/Makefile.in
 +++ kaudiocreator/icons/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -431,7 +434,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -10547,7 +13803,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10561,17 +13817,17 @@
  mostlyclean-libtool:
 --- kaudiocreator/Makefile.in
 +++ kaudiocreator/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -273,6 +273,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -533,7 +536,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10580,7 +13836,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -571,9 +574,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10592,7 +13848,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1056,13 +1059,6 @@
+@@ -1070,13 +1073,6 @@
  .NOEXPORT:
  
  #>+ 3
@@ -10606,7 +13862,7 @@
  encodefileimp.moc: $(srcdir)/encodefileimp.h
  	$(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
  
-@@ -1070,18 +1066,18 @@
+@@ -1084,18 +1080,18 @@
  mocs: encodefileimp.moc
  
  #>+ 3
@@ -10631,7 +13887,7 @@
  
  #>+ 3
  kaudiocreator.moc: $(srcdir)/kaudiocreator.h
-@@ -1091,11 +1087,11 @@
+@@ -1105,11 +1101,11 @@
  mocs: kaudiocreator.moc
  
  #>+ 3
@@ -10646,7 +13902,7 @@
  
  #>+ 3
  ripper.moc: $(srcdir)/ripper.h
-@@ -1105,8 +1101,15 @@
+@@ -1119,8 +1115,15 @@
  mocs: ripper.moc
  
  #>+ 3
@@ -10662,54 +13918,49 @@
 +	-rm -f  encodefileimp.moc encoder.moc encoderconfigimp.moc kaudiocreator.moc tracksimp.moc ripper.moc jobqueimp.moc
  
  #>+ 2
- KDE_DIST=encoderedit.ui prefs.kcfgc lo16-app-kaudiocreator.png eventsrc encoderconfig.ui.h encoder_prefs.kcfgc encoderoutput.ui encoderconfig.ui kaudiocreator_encoders.kcfg wizard.ui.h ripconfig.ui Makefile.in job.h encoder_prefs_addons.h kaudiocreator-meta.upd general.ui.h kaudiocreator.kcfg upgrade-kaudiocreator-metadata.sh cdconfig.ui tracks.ui jobque.ui kaudiocreatorui.rc encodefile.ui kaudiocreator_workman.h cr32-app-kaudiocreator.png wizard.ui cr16-app-kaudiocreator.png kaudiocreator-libkcddb.upd configure.in.in general.ui infodialog.ui lo32-app-kaudiocreator.png Makefile.am 
-@@ -1137,20 +1140,20 @@
- 
- #>+ 16
+ KDE_DIST=hi32-app-kaudiocreator.png encoderedit.ui prefs.kcfgc lo16-app-kaudiocreator.png eventsrc encoderconfig.ui.h encoder_prefs.kcfgc encoderoutput.ui jobqueimp.h encoderconfig.ui kaudiocreator_encoders.kcfg wizard.ui.h ripconfig.ui audiocd_extract.desktop Makefile.in job.h encoder_prefs_addons.h kaudiocreator-meta.upd general.ui.h kaudiocreator.kcfg upgrade-kaudiocreator-metadata.sh hi16-app-kaudiocreator.png cdconfig.ui tracks.ui jobque.ui kaudiocreatorui.rc encodefile.ui kaudiocreator_workman.h wizard.ui kaudiocreator-libkcddb.upd configure.in.in general.ui infodialog.ui lo32-app-kaudiocreator.png Makefile.am 
+@@ -1153,18 +1156,18 @@
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/lo32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaudiocreator.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaudiocreator.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/lo32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
 -	$(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaudiocreator.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/lo32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kaudiocreator.png
++	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kaudiocreator.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaudiocreator.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
  
  #>+ 15
  force-reedit:
-@@ -1191,7 +1194,7 @@
+@@ -1205,7 +1208,7 @@
  
  
  #>+ 11
--kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp encodefile.cpp prefs.cpp encoder_prefs.cpp  general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc ripper.moc jobqueimp.moc jobque.moc cdconfig.moc encoderedit.moc
-+kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp encodefile.cpp prefs.cpp encoder_prefs.cpp  general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc jobqueimp.moc ripper.moc jobque.moc cdconfig.moc encoderedit.moc
+-kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp  ../libkcddb/configbase.h $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp  ../libkcddb/configbase.h ../libkcddb/cdinfodialogbase.h $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp  wizard.h encodefile.cpp prefs.cpp encoder_prefs.cpp  general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc ripper.moc jobqueimp.moc jobque.moc cdconfig.moc encoderedit.moc
++kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp  ../libkcddb/configbase.h $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp  ../libkcddb/configbase.h ../libkcddb/cdinfodialogbase.h $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp  wizard.h encodefile.cpp prefs.cpp encoder_prefs.cpp  general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc jobqueimp.moc ripper.moc jobque.moc cdconfig.moc encoderedit.moc
  	@echo 'creating kaudiocreator.all_cpp.cpp ...'; \
  	rm -f kaudiocreator.all_cpp.files kaudiocreator.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kaudiocreator.all_cpp.final; \
-@@ -1242,8 +1245,8 @@
+@@ -1252,8 +1255,8 @@
  encodefileimp.lo: encodefileimp.moc 
  kaudiocreator.lo: kaudiocreator.moc 
  $(srcdir)/tracksimp.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h 
 -ripper.o: ripper.moc 
  jobqueimp.o: jobqueimp.moc 
 +ripper.o: ripper.moc 
- tracksimp.o: tracksimp.moc 
  encoder.o: encoder.moc 
  nmcheck: 
-@@ -1253,8 +1256,8 @@
+ $(srcdir)/ripper.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h 
+@@ -1261,8 +1264,8 @@
  nmcheck-am: nmcheck
  $(srcdir)/encoder.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h 
  ripper.lo: ripper.moc 
@@ -10721,17 +13972,17 @@
  #>+ 177
 --- kfile-plugins/au/Makefile.in
 +++ kfile-plugins/au/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10740,7 +13991,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10754,17 +14005,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/avi/Makefile.in
 +++ kfile-plugins/avi/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10773,7 +14024,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10787,17 +14038,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/flac/Makefile.in
 +++ kfile-plugins/flac/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10806,7 +14057,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10820,17 +14071,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/m3u/Makefile.in
 +++ kfile-plugins/m3u/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10839,7 +14090,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10853,17 +14104,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/Makefile.in
 +++ kfile-plugins/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -443,7 +446,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -10872,7 +14123,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -481,9 +484,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10886,17 +14137,17 @@
  mostlyclean-libtool:
 --- kfile-plugins/mp3/Makefile.in
 +++ kfile-plugins/mp3/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10905,7 +14156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10919,17 +14170,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/mpc/Makefile.in
 +++ kfile-plugins/mpc/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10938,7 +14189,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10950,19 +14201,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kfile-plugins/mpeg/Makefile.in
++++ kfile-plugins/mpeg/Makefile.in
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -481,7 +484,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -519,9 +522,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kfile-plugins/ogg/Makefile.in
 +++ kfile-plugins/ogg/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -251,6 +251,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -492,7 +495,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -10971,7 +14255,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -530,9 +533,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10985,17 +14269,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/sid/Makefile.in
 +++ kfile-plugins/sid/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11004,7 +14288,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11018,17 +14302,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/theora/Makefile.in
 +++ kfile-plugins/theora/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11037,7 +14321,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11051,17 +14335,17 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/wav/Makefile.in
 +++ kfile-plugins/wav/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11070,7 +14354,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11084,17 +14368,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/kcmaudiocd/Makefile.in
 +++ kioslave/audiocd/kcmaudiocd/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -476,7 +479,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11103,7 +14387,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -514,9 +517,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11117,17 +14401,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/Makefile.in
 +++ kioslave/audiocd/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -262,6 +262,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -506,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11136,7 +14420,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -544,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11150,17 +14434,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/flac/Makefile.in
 +++ kioslave/audiocd/plugins/flac/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -235,6 +235,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -470,7 +473,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11169,7 +14453,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11183,17 +14467,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/lame/Makefile.in
 +++ kioslave/audiocd/plugins/lame/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -242,6 +242,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -480,7 +483,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11202,7 +14486,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -518,9 +521,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11216,17 +14500,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/Makefile.in
 +++ kioslave/audiocd/plugins/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -256,6 +256,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -491,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11235,7 +14519,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -529,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11249,17 +14533,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/vorbis/Makefile.in
 +++ kioslave/audiocd/plugins/vorbis/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -243,6 +243,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11268,7 +14552,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11282,17 +14566,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/wav/Makefile.in
 +++ kioslave/audiocd/plugins/wav/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -238,6 +238,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -474,7 +477,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11301,7 +14585,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -512,9 +515,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11315,17 +14599,17 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/Makefile.in
 +++ kioslave/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -437,7 +440,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -11334,7 +14618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -475,9 +478,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11348,17 +14632,17 @@
  mostlyclean-libtool:
 --- kmid/examples/Makefile.in
 +++ kmid/examples/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -434,7 +437,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11367,7 +14651,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -472,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11381,17 +14665,17 @@
  mostlyclean-libtool:
 --- kmid/Makefile.in
 +++ kmid/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -293,6 +293,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -568,7 +571,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11400,7 +14684,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -606,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11412,7 +14696,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1288,13 +1291,6 @@
+@@ -1258,13 +1261,6 @@
  mocs: channelcfgdlg.moc
  
  #>+ 3
@@ -11426,7 +14710,7 @@
  kmid_part.moc: $(srcdir)/kmid_part.h
  	$(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
  
-@@ -1302,11 +1298,11 @@
+@@ -1272,11 +1268,11 @@
  mocs: kmid_part.moc
  
  #>+ 3
@@ -11441,7 +14725,7 @@
  
  #>+ 3
  qslidertime.moc: $(srcdir)/qslidertime.h
-@@ -1316,6 +1312,13 @@
+@@ -1286,6 +1282,13 @@
  mocs: qslidertime.moc
  
  #>+ 3
@@ -11455,7 +14739,7 @@
  kmidframe.moc: $(srcdir)/kmidframe.h
  	$(MOC) $(srcdir)/kmidframe.h -o kmidframe.moc
  
-@@ -1340,7 +1343,7 @@
+@@ -1310,7 +1313,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11463,27 +14747,32 @@
 +	-rm -f  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
  
  #>+ 2
- KDE_DIST=kmidbutton.h audiomidi.desktop PEOPLE std.sb kmidIface.h drums.sb instrname.i18n button1.xpm Makefile.in kmid.lsm kmid.desktop kmid_partui.rc x-karaoke.desktop cr16-app-kmid.png instrfilter.awk kmid.spec kmidui.rc history.txt configure.in.in button2.xpm cr32-app-kmid.png version.h keyboard.xpm cr48-app-kmid.png Makefile.am 
-@@ -1361,15 +1364,15 @@
+ KDE_DIST=kmidbutton.h audiomidi.desktop PEOPLE std.sb kmidIface.h drums.sb hi48-app-kmid.png instrname.i18n button1.xpm Makefile.in hi32-app-kmid.png kmid.lsm kmid.desktop kmid_partui.rc hi16-app-kmid.png x-karaoke.desktop instrfilter.awk kmid.spec kmidui.rc history.txt configure.in.in button2.xpm version.h keyboard.xpm Makefile.am 
+@@ -1329,17 +1332,17 @@
+ 
+ #>+ 13
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmid.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmid.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kmid.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
  
  uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmid.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmid.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmid.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmid.png
  
  #>+ 15
  force-reedit:
-@@ -1410,7 +1413,7 @@
+@@ -1380,7 +1383,7 @@
  
  
  #>+ 11
@@ -11494,17 +14783,17 @@
  	echo "#define KDE_USE_FINAL 1" >> libkmidlib_la.all_cpp.final; \
 --- kmid/maps/Makefile.in
 +++ kmid/maps/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -432,7 +435,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11513,7 +14802,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -470,9 +473,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11527,17 +14816,17 @@
  mostlyclean-libtool:
 --- kmid/pics/Makefile.in
 +++ kmid/pics/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11546,7 +14835,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11558,7 +14847,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -643,21 +646,21 @@
+@@ -613,21 +616,21 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions
  	$(INSTALL_DATA) $(srcdir)/cr22-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
@@ -11586,17 +14875,17 @@
  force-reedit:
 --- kmix/Makefile.in
 +++ kmix/Makefile.in
-@@ -331,6 +331,9 @@
+@@ -324,6 +324,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -652,7 +655,7 @@
+@@ -622,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11605,7 +14894,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +693,9 @@
+@@ -660,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11617,7 +14906,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1357,18 +1360,18 @@
+@@ -1328,18 +1331,18 @@
  mocs: viewswitches.moc
  
  #>+ 3
@@ -11642,7 +14931,7 @@
  
  #>+ 3
  ksmallslider.moc: $(srcdir)/ksmallslider.h
-@@ -1399,13 +1402,6 @@
+@@ -1377,13 +1380,6 @@
  mocs: viewapplet.moc
  
  #>+ 3
@@ -11656,7 +14945,7 @@
  mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
  	$(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
  
-@@ -1413,11 +1409,11 @@
+@@ -1391,11 +1387,11 @@
  mocs: mixdevicewidget.moc
  
  #>+ 3
@@ -11671,7 +14960,7 @@
  
  #>+ 3
  dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
-@@ -1427,6 +1423,13 @@
+@@ -1405,6 +1401,13 @@
  mocs: dialogviewconfiguration.moc
  
  #>+ 3
@@ -11685,7 +14974,7 @@
  kmixapplet.moc: $(srcdir)/kmixapplet.h
  	$(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
  
-@@ -1448,18 +1451,18 @@
+@@ -1426,18 +1429,18 @@
  mocs: kmix.moc
  
  #>+ 3
@@ -11710,7 +14999,7 @@
  
  #>+ 3
  mixdevice.moc: $(srcdir)/mixdevice.h
-@@ -1490,18 +1493,18 @@
+@@ -1468,18 +1471,18 @@
  mocs: viewsurround.moc
  
  #>+ 3
@@ -11735,37 +15024,37 @@
  
  #>+ 3
  kledbutton.moc: $(srcdir)/kledbutton.h
-@@ -1537,7 +1540,7 @@
+@@ -1515,7 +1518,7 @@
  
  #>+ 3
  clean-metasources:
--	-rm -f  viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc mdwenum.moc viewapplet.moc kmixprefdlg.moc mixdevicewidget.moc KMixApp.moc dialogviewconfiguration.moc kmixapplet.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
-+	-rm -f  viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc mdwenum.moc viewapplet.moc mixdevicewidget.moc kmixprefdlg.moc dialogviewconfiguration.moc KMixApp.moc kmixapplet.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
+-	-rm -f  viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc viewapplet.moc kmixprefdlg.moc mixdevicewidget.moc KMixApp.moc dialogviewconfiguration.moc kmixapplet.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
++	-rm -f  viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc viewapplet.moc mixdevicewidget.moc kmixprefdlg.moc dialogviewconfiguration.moc KMixApp.moc kmixapplet.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
  
  #>+ 2
  KDE_DIST=kmix.desktop resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop viewapplet.h mixer_irix.cpp mixer_sun.cpp kmixctrl_restore.desktop Makefile.in restore_kmix_volumes.desktop TestCases mixer_hpux.h mixer_irix.h mixer_none.cpp configure.in.in mixer_oss.cpp mixer_none.h mixer_alsa9.cpp Makefile.am mixer_oss.h 
-@@ -1600,7 +1603,7 @@
+@@ -1578,7 +1581,7 @@
  
  
  #>+ 11
--libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/mixer_backend.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp $(srcdir)/dialogselectmaster.cpp mixerIface_skel.cpp  viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc mdwenum.moc mixdevicewidget.moc kmixprefdlg.moc KMixApp.moc dialogviewconfiguration.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
-+libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/mixer_backend.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp $(srcdir)/dialogselectmaster.cpp mixerIface_skel.cpp  viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc mdwenum.moc kmixprefdlg.moc mixdevicewidget.moc dialogviewconfiguration.moc KMixApp.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
+-libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/viewgrid.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/mixer_backend.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp $(srcdir)/dialogselectmaster.cpp mixerIface_skel.cpp  viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc mixdevicewidget.moc kmixprefdlg.moc KMixApp.moc dialogviewconfiguration.moc mdwslider.moc kmix.moc mdwswitch.moc viewsliders.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
++libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/viewgrid.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/mixer_backend.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp $(srcdir)/dialogselectmaster.cpp mixerIface_skel.cpp  viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc viewgrid.moc mdwenum.moc kmixprefdlg.moc mixdevicewidget.moc dialogviewconfiguration.moc KMixApp.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc dialogselectmaster.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
  	@echo 'creating libkdeinit_kmix_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_kmix_la.all_cpp.files libkdeinit_kmix_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kmix_la.all_cpp.final; \
 --- kmix/pics/Makefile.in
 +++ kmix/pics/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -440,7 +443,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -11774,7 +15063,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11786,52 +15075,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -680,23 +683,23 @@
+@@ -650,23 +653,23 @@
  
  #>+ 19
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmix.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kmix.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmix.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kmix.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmix.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kmix.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmix.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmix.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmix.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmix.png
  
  #>+ 15
  force-reedit:
 --- krec/Makefile.in
 +++ krec/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -319,6 +319,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -649,7 +652,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11840,7 +15129,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -687,9 +690,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11852,7 +15141,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1363,18 +1366,18 @@
+@@ -1282,7 +1285,7 @@
+ 
+ #>- krecord.lo: ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h
+ #>+ 1
+-krecord.lo: krecord.moc krecord_private.moc  ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h
++krecord.lo: krecord_private.moc krecord.moc  ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+@@ -1337,18 +1340,18 @@
  mocs: krecglobal.moc
  
  #>+ 3
@@ -11877,7 +15175,7 @@
  
  #>+ 3
  krecconfig_files.moc: $(srcdir)/krecconfig_files.h
-@@ -1391,13 +1394,6 @@
+@@ -1365,13 +1368,6 @@
  mocs: krecfileview.moc
  
  #>+ 3
@@ -11891,7 +15189,7 @@
  krecfilewidgets.moc: $(srcdir)/krecfilewidgets.h
  	$(MOC) $(srcdir)/krecfilewidgets.h -o krecfilewidgets.moc
  
-@@ -1405,11 +1401,11 @@
+@@ -1379,11 +1375,11 @@
  mocs: krecfilewidgets.moc
  
  #>+ 3
@@ -11906,7 +15204,7 @@
  
  #>+ 3
  krecconfigure.moc: $(srcdir)/krecconfigure.h
-@@ -1419,6 +1415,13 @@
+@@ -1393,6 +1389,13 @@
  mocs: krecconfigure.moc
  
  #>+ 3
@@ -11920,7 +15218,7 @@
  krecconfig_fileswidget.moc: $(srcdir)/krecconfig_fileswidget.h
  	$(MOC) $(srcdir)/krecconfig_fileswidget.h -o krecconfig_fileswidget.moc
  
-@@ -1486,10 +1489,10 @@
+@@ -1460,10 +1463,10 @@
  
  #>+ 3
  clean-metasources:
@@ -11928,66 +15226,65 @@
 +	-rm -f  krecnewproperties.moc krecglobal.moc krecord_private.moc krecord.moc krecconfig_files.moc krecfileview.moc krecfilewidgets.moc krecexport_template.moc krecconfigure.moc krecexport_wave.moc krecconfig_fileswidget.moc krecfile.moc krecfileviewhelpers.moc
  
  #>+ 2
--KDE_DIST=krec_exportwave.desktop cr128-app-krec.png cr16-app-krec.png globals.h krec.desktop cr32-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h cr64-app-krec.png krecfileviewhelpers.h krecfileview.h krecconfigure.h krecfile.h krecord_private.h krecord.h krecglobal.h cr22-app-krec.png krecui.rc configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop cr48-app-krec.png Makefile.am 
-+KDE_DIST=krec_exportwave.desktop cr128-app-krec.png cr16-app-krec.png globals.h krec.desktop cr32-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h cr64-app-krec.png krecfileviewhelpers.h krecfileview.h krecconfigure.h krecord_private.h krecfile.h krecord.h cr22-app-krec.png krecglobal.h krecui.rc configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop cr48-app-krec.png Makefile.am 
+-KDE_DIST=hi48-app-krec.png krec_exportwave.desktop globals.h krec.desktop hi22-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h krecfileviewhelpers.h hi128-app-krec.png krecfileview.h krecconfigure.h krecfile.h krecord_private.h hi16-app-krec.png krecord.h krecglobal.h krecui.rc hi32-app-krec.png hi64-app-krec.png configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop Makefile.am 
++KDE_DIST=hi48-app-krec.png krec_exportwave.desktop globals.h krec.desktop hi22-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h krecfileviewhelpers.h hi128-app-krec.png krecfileview.h krecconfigure.h krecord_private.h krecfile.h hi16-app-krec.png krecord.h krecglobal.h krecui.rc hi32-app-krec.png hi64-app-krec.png configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop Makefile.am 
  
  #>+ 3
  clean-closures:
-@@ -1500,26 +1503,26 @@
+@@ -1474,25 +1477,25 @@
  
  #>+ 22
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/krec.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/krec.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/krec.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/krec.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-krec.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/krec.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/krec.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/krec.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/krec.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/krec.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/krec.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/krec.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/krec.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/krec.png
  
  #>+ 15
- force-reedit:
-@@ -1560,7 +1563,7 @@
+@@ -1534,7 +1537,7 @@
  
  
  #>+ 11
--libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
-+libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
+-libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h  krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
++libkdeinit_krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h  krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
  	@echo 'creating libkdeinit_krec_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_krec_la.all_cpp.files libkdeinit_krec_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_krec_la.all_cpp.final; \
-@@ -1572,7 +1575,7 @@
+@@ -1546,7 +1549,7 @@
  	rm -f libkdeinit_krec_la.all_cpp.final libkdeinit_krec_la.all_cpp.files
  
  #>+ 11
--krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
-+krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
+-krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h  krecnewproperties.moc krecord_private.moc krecord.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
++krec_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/krecnewproperties.cpp $(srcdir)/krecfile.cpp $(srcdir)/krecfileview.cpp $(srcdir)/krecfileviewhelpers.cpp $(srcdir)/krecfilewidgets.cpp $(srcdir)/main.cpp $(srcdir)/krecord.cpp  ../arts/gui/common/artsgui.h ../arts/modules/effects/artsmoduleseffects.h ../arts/modules/common/artsmodulescommon.h ../arts/midi/artsmidi.h ../arts/modules/synth/artsmodulessynth.h  krecnewproperties.moc krecord.moc krecord_private.moc krecfileview.moc krecfilewidgets.moc krecfile.moc krecfileviewhelpers.moc
  	@echo 'creating krec_la.all_cpp.cpp ...'; \
  	rm -f krec_la.all_cpp.files krec_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> krec_la.all_cpp.final; \
-@@ -1652,11 +1655,11 @@
+@@ -1622,7 +1625,7 @@
  krecnewproperties.o: krecnewproperties.moc 
  krecexport_wave.lo: krecexport_wave.moc 
  krecconfig_files.o: krecconfig_files.moc 
@@ -11996,24 +15293,19 @@
  krecfileviewhelpers.o: krecfileviewhelpers.moc 
  nmcheck: 
  krecfile.o: krecfile.moc 
--krecord.lo: krecord.moc krecord_private.moc 
-+krecord.lo: krecord_private.moc krecord.moc 
- krecexport_template.lo: krecexport_template.moc 
- krecfileview.lo: krecfileview.moc 
- krecconfig_files.lo: krecconfig_files.moc 
 --- krec/mp3_export/Makefile.in
 +++ krec/mp3_export/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -238,6 +238,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12022,7 +15314,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12036,17 +15328,17 @@
  	@$(NORMAL_INSTALL)
 --- krec/ogg_export/Makefile.in
 +++ krec/ogg_export/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -238,6 +238,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12055,7 +15347,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12069,17 +15361,17 @@
  	@$(NORMAL_INSTALL)
 --- krec/pics/Makefile.in
 +++ krec/pics/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12088,7 +15380,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12100,7 +15392,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -641,24 +644,24 @@
+@@ -611,24 +614,24 @@
  
  #>+ 20
  install-kde-icons:
@@ -12135,17 +15427,17 @@
  force-reedit:
 --- kscd/bitmaps/Makefile.in
 +++ kscd/bitmaps/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -420,7 +423,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -12154,7 +15446,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12168,17 +15460,17 @@
  mostlyclean-libtool:
 --- kscd/kscdmagic/Makefile.in
 +++ kscd/kscdmagic/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -257,6 +257,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -502,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -12187,7 +15479,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -540,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12201,17 +15493,17 @@
  	@$(NORMAL_INSTALL)
 --- kscd/libwm/audio/Makefile.in
 +++ kscd/libwm/audio/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -219,6 +219,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -448,7 +451,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -12220,7 +15512,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -486,9 +489,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12234,17 +15526,17 @@
  clean-noinstLTLIBRARIES:
 --- kscd/libwm/Makefile.in
 +++ kscd/libwm/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -250,6 +250,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -489,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -12253,7 +15545,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -527,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12267,17 +15559,17 @@
  clean-noinstLTLIBRARIES:
 --- kscd/Makefile.in
 +++ kscd/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -279,6 +279,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -549,7 +552,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12286,7 +15578,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -587,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12296,64 +15588,59 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -1172,7 +1175,7 @@
- 	-rm -f  bwlednum.moc kscd.moc docking.moc ledlamp.moc configWidget.moc kvolumecontrol.moc cddbdlg.moc
  
+ clean-noinstLTLIBRARIES:
+@@ -1180,7 +1183,7 @@
+ 	-rm -f  bwlednum.moc kscd.moc docking.moc kcompactdisc.moc ledlamp.moc configWidget.moc cddbdlg.moc
+ 
  #>+ 2
--KDE_DIST=cr48-app-kscd.png audiocd_play.desktop panel.ui prefs.kcfgc CDQuery.txt kscd.desktop Makefile.in cr128-app-kscd.png xmcd.desktop configWidgetUI.ui kscd-script kscd.lsm cr16-app-kscd.png cddaslave.c kscd.kcfg cr64-app-kscd.png cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h cr32-app-kscd.png Makefile.am 
-+KDE_DIST=cr48-app-kscd.png audiocd_play.desktop prefs.kcfgc panel.ui CDQuery.txt kscd.desktop Makefile.in cr128-app-kscd.png xmcd.desktop configWidgetUI.ui kscd-script kscd.lsm cr16-app-kscd.png cddaslave.c kscd.kcfg cr64-app-kscd.png cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h cr32-app-kscd.png Makefile.am 
+-KDE_DIST=hi16-app-kscd.png audiocd_play.desktop panel.ui prefs.kcfgc CDQuery.txt kscd.desktop Makefile.in xmcd.desktop hi48-app-kscd.png kcompactdisc.h hi128-app-kscd.png configWidgetUI.ui hi64-app-kscd.png hi32-app-kscd.png kscd-script kscd.lsm cddaslave.c kscd.kcfg cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h Makefile.am 
++KDE_DIST=hi16-app-kscd.png audiocd_play.desktop prefs.kcfgc panel.ui CDQuery.txt kscd.desktop Makefile.in xmcd.desktop hi48-app-kscd.png kcompactdisc.h configWidgetUI.ui hi128-app-kscd.png hi64-app-kscd.png hi32-app-kscd.png kscd-script kscd.lsm cddaslave.c kscd.kcfg cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h Makefile.am 
  
  #>+ 4
  clean-idl:
-@@ -1197,24 +1200,24 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions
+@@ -1207,22 +1210,22 @@
  	$(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kscd.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kscd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kscd.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kscd.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
  
  uninstall-kde-icons:
  	-rm -f $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kscd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kscd.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kscd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kscd.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kscd.png
  
  #>+ 15
  force-reedit:
 --- libkcddb/kcmcddb/Makefile.in
 +++ libkcddb/kcmcddb/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -487,7 +490,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12362,7 +15649,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -525,9 +528,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12374,7 +15661,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -885,7 +888,7 @@
+@@ -855,7 +858,7 @@
  	-rm -f  cddbconfigwidget.moc kcmcddb.moc
  
  #>+ 2
@@ -12385,26 +15672,26 @@
  clean-ui:
 --- libkcddb/Makefile.in
 +++ libkcddb/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -270,6 +270,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -525,7 +528,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -563,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12416,7 +15703,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1009,32 +1012,32 @@
+@@ -1080,32 +1083,32 @@
  .NOEXPORT:
  
  #>+ 3
@@ -12461,37 +15748,37 @@
  
  #>+ 3
  asynchttplookup.moc: $(srcdir)/asynchttplookup.h
-@@ -1052,7 +1055,7 @@
+@@ -1130,7 +1133,7 @@
  
  #>+ 3
  clean-metasources:
--	-rm -f  httplookup.moc asynccddbplookup.moc client.moc asyncsmtpsubmit.moc asynchttplookup.moc asynchttpsubmit.moc
-+	-rm -f  client.moc httplookup.moc asyncsmtpsubmit.moc asynccddbplookup.moc asynchttplookup.moc asynchttpsubmit.moc
+-	-rm -f  httplookup.moc asynccddbplookup.moc client.moc asyncsmtpsubmit.moc asynchttplookup.moc asynchttpsubmit.moc cdinfoencodingwidget.moc
++	-rm -f  client.moc httplookup.moc asyncsmtpsubmit.moc asynccddbplookup.moc asynchttplookup.moc asynchttpsubmit.moc cdinfoencodingwidget.moc
  
  #>+ 2
- KDE_DIST=categories.h httplookup.h configbase.kcfgc asynccddbplookup.h asynchttplookup.h synchttplookup.h asyncsmtpsubmit.h genres.h Makefile.in lookup.h sites.h libkcddb.kcfg cdinfodialogbase.ui.h smtpsubmit.h asynchttpsubmit.h httpsubmit.h synchttpsubmit.h submit.h cdinfodialogbase.ui cddbplookup.h synccddbplookup.h syncsmtpsubmit.h Makefile.am 
-@@ -1109,7 +1112,7 @@
+ KDE_DIST=categories.h httplookup.h configbase.kcfgc asynccddbplookup.h asynchttplookup.h synchttplookup.h asyncsmtpsubmit.h genres.h cdinfoencodingwidgetbase.ui Makefile.in lookup.h sites.h libkcddb.kcfg cdinfodialogbase.ui.h smtpsubmit.h asynchttpsubmit.h httpsubmit.h synchttpsubmit.h submit.h cdinfodialogbase.ui cddbplookup.h synccddbplookup.h syncsmtpsubmit.h Makefile.am cdinfoencodingwidget.h 
+@@ -1188,7 +1191,7 @@
  
  
  #>+ 11
--libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp cdinfodialogbase.cpp configbase.cpp  asyncsmtpsubmit.moc client.moc asynccddbplookup.moc httplookup.moc cdinfodialogbase.moc asynchttpsubmit.moc asynchttplookup.moc
-+libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp cdinfodialogbase.cpp configbase.cpp  asynccddbplookup.moc asyncsmtpsubmit.moc httplookup.moc client.moc cdinfodialogbase.moc asynchttpsubmit.moc asynchttplookup.moc
+-libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp  configbase.h $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp $(srcdir)/cdinfoencodingwidget.cpp cdinfodialogbase.cpp cdinfoencodingwidgetbase.cpp configbase.cpp  asyncsmtpsubmit.moc asynchttplookup.moc cdinfoencodingwidgetbase.moc cdinfoencodingwidget.moc cdinfodialogbase.moc httplookup.moc asynccddbplookup.moc client.moc asynchttpsubmit.moc
++libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp  configbase.h $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp $(srcdir)/cdinfoencodingwidget.cpp cdinfodialogbase.cpp cdinfoencodingwidgetbase.cpp configbase.cpp  asyncsmtpsubmit.moc asynchttplookup.moc cdinfoencodingwidgetbase.moc cdinfoencodingwidget.moc cdinfodialogbase.moc client.moc httplookup.moc asynccddbplookup.moc asynchttpsubmit.moc
  	@echo 'creating libkcddb_la.all_cpp.cpp ...'; \
  	rm -f libkcddb_la.all_cpp.files libkcddb_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkcddb_la.all_cpp.final; \
 --- libkcddb/test/Makefile.in
 +++ libkcddb/test/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -291,6 +291,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -549,7 +552,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12500,7 +15787,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -587,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12512,7 +15799,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-@@ -898,22 +901,22 @@
+@@ -868,22 +871,22 @@
  mocs: asynccddblookuptest.moc
  
  #>+ 3
@@ -12544,17 +15831,17 @@
  KDE_DIST=asynccddblookuptest.h asynchttplookuptest.h asyncsmtpsubmittest.h Makefile.in asynchttpsubmittest.h Makefile.am 
 --- Makefile.in
 +++ Makefile.in
-@@ -234,6 +234,9 @@
+@@ -227,6 +227,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -464,7 +467,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -12563,7 +15850,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -536,12 +539,12 @@
+@@ -506,12 +509,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -12578,7 +15865,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -553,7 +556,7 @@
+@@ -523,7 +526,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -12587,28 +15874,28 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -970,7 +973,7 @@
+@@ -940,7 +943,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
+-KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:
 --- mpeglib/example/cddaplay/Makefile.in
 +++ mpeglib/example/cddaplay/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -231,6 +231,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -464,7 +467,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12617,7 +15904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -502,9 +505,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12631,17 +15918,17 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/Makefile.in
 +++ mpeglib/example/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -436,7 +439,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12650,7 +15937,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12664,17 +15951,17 @@
  mostlyclean-libtool:
 --- mpeglib/example/mpgplay/Makefile.in
 +++ mpeglib/example/mpgplay/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -231,6 +231,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -465,7 +468,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12683,7 +15970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -503,9 +506,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12697,17 +15984,17 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/splay/Makefile.in
 +++ mpeglib/example/splay/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -236,6 +236,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -475,7 +478,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12716,7 +16003,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -513,9 +516,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12730,17 +16017,17 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/tplay/Makefile.in
 +++ mpeglib/example/tplay/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -231,6 +231,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -465,7 +468,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12749,7 +16036,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -503,9 +506,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12763,17 +16050,17 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/yaf/Makefile.in
 +++ mpeglib/example/yaf/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -212,6 +212,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -441,7 +444,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12782,7 +16069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -479,9 +482,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12796,17 +16083,17 @@
  mostlyclean-libtool:
 --- mpeglib/example/yaf/yafcdda/Makefile.in
 +++ mpeglib/example/yaf/yafcdda/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -235,6 +235,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -470,7 +473,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12815,7 +16102,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12829,17 +16116,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafcore/Makefile.in
 +++ mpeglib/example/yaf/yafcore/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -248,6 +248,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -509,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12848,7 +16135,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -547,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12862,17 +16149,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafmpgplay/Makefile.in
 +++ mpeglib/example/yaf/yafmpgplay/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -235,6 +235,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12881,7 +16168,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12895,17 +16182,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafsplay/Makefile.in
 +++ mpeglib/example/yaf/yafsplay/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -235,6 +235,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12914,7 +16201,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12928,17 +16215,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yaftplay/Makefile.in
 +++ mpeglib/example/yaf/yaftplay/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -235,6 +235,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -470,7 +473,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12947,7 +16234,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12961,17 +16248,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafvorbis/Makefile.in
 +++ mpeglib/example/yaf/yafvorbis/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -235,6 +235,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -472,7 +475,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12980,7 +16267,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -510,9 +513,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12994,17 +16281,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafxplayer/Makefile.in
 +++ mpeglib/example/yaf/yafxplayer/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -247,6 +247,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13013,7 +16300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13027,17 +16314,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafyuv/Makefile.in
 +++ mpeglib/example/yaf/yafyuv/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -235,6 +235,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13046,7 +16333,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13060,17 +16347,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/lib/decoder/Makefile.in
 +++ mpeglib/lib/decoder/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -485,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13079,7 +16366,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -523,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13093,17 +16380,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/frame/Makefile.in
 +++ mpeglib/lib/frame/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -485,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13112,7 +16399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -523,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13126,17 +16413,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/input/Makefile.in
 +++ mpeglib/lib/input/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -250,6 +250,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -507,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13145,7 +16432,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -545,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13159,17 +16446,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/Makefile.in
 +++ mpeglib/lib/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -255,6 +255,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -506,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13178,7 +16465,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -544,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13192,17 +16479,17 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/lib/mpegplay/Makefile.in
 +++ mpeglib/lib/mpegplay/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -265,6 +265,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -532,7 +535,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .S .cpp .lo .o .obj
@@ -13211,7 +16498,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -570,9 +573,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13225,17 +16512,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/mpgplayer/Makefile.in
 +++ mpeglib/lib/mpgplayer/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -237,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -468,7 +471,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13244,7 +16531,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -506,9 +509,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13258,17 +16545,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/oggvorbis/Makefile.in
 +++ mpeglib/lib/oggvorbis/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -242,6 +242,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -477,7 +480,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13277,7 +16564,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -515,9 +518,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13291,17 +16578,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/output/Makefile.in
 +++ mpeglib/lib/output/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -248,6 +248,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -496,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13310,7 +16597,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -534,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13324,17 +16611,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/splay/Makefile.in
 +++ mpeglib/lib/splay/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -250,6 +250,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -507,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13343,7 +16630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -545,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13357,17 +16644,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/tplay/Makefile.in
 +++ mpeglib/lib/tplay/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -232,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -465,7 +468,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13376,7 +16663,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -503,9 +506,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13390,17 +16677,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/abstract/Makefile.in
 +++ mpeglib/lib/util/abstract/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -240,6 +240,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13409,7 +16696,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13423,17 +16710,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/audio/Makefile.in
 +++ mpeglib/lib/util/audio/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -232,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -467,7 +470,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13442,7 +16729,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -505,9 +508,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13456,17 +16743,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/file/Makefile.in
 +++ mpeglib/lib/util/file/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -237,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -469,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13475,7 +16762,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -507,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13489,17 +16776,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/Makefile.in
 +++ mpeglib/lib/util/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -258,6 +258,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -504,7 +507,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13508,7 +16795,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -542,9 +545,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13522,17 +16809,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/mmx/Makefile.in
 +++ mpeglib/lib/util/mmx/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -233,6 +233,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -466,7 +469,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -13541,7 +16828,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -504,9 +507,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13555,17 +16842,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/dither/Makefile.in
 +++ mpeglib/lib/util/render/dither/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -238,6 +238,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -482,7 +485,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13574,7 +16861,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -520,9 +523,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13588,17 +16875,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/dither2YUV/Makefile.in
 +++ mpeglib/lib/util/render/dither2YUV/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -234,6 +234,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -469,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13607,7 +16894,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -507,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13621,17 +16908,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/Makefile.in
 +++ mpeglib/lib/util/render/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -258,6 +258,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13640,7 +16927,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13654,17 +16941,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/sdl/Makefile.in
 +++ mpeglib/lib/util/render/sdl/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -232,6 +232,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -462,7 +465,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13673,7 +16960,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -500,9 +503,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13687,17 +16974,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/x11/Makefile.in
 +++ mpeglib/lib/util/render/x11/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -234,6 +234,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13706,7 +16993,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13720,17 +17007,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/yuv/Makefile.in
 +++ mpeglib/lib/yuv/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -237,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -469,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13739,7 +17026,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -507,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13753,17 +17040,17 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/Makefile.in
 +++ mpeglib/Makefile.in
-@@ -220,6 +220,9 @@
+@@ -213,6 +213,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -442,7 +445,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -13772,7 +17059,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13786,17 +17073,17 @@
  mostlyclean-libtool:
 --- mpeglib_artsplug/Makefile.in
 +++ mpeglib_artsplug/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -278,6 +278,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -13805,7 +17092,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13817,7 +17104,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1016,7 +1019,7 @@
+@@ -990,7 +993,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -13828,17 +17115,17 @@
  docs-am:
 --- mpg123_artsplugin/Makefile.in
 +++ mpg123_artsplugin/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -269,6 +269,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -510,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -13847,7 +17134,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -548,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13861,17 +17148,17 @@
  	@$(NORMAL_INSTALL)
 --- mpg123_artsplugin/mpg123/Makefile.in
 +++ mpg123_artsplugin/mpg123/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -306,6 +306,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -561,7 +564,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj .s
@@ -13880,7 +17167,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13894,17 +17181,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/app/Makefile.in
 +++ noatun/app/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -249,6 +249,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -486,7 +489,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13913,7 +17200,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -524,9 +527,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13927,17 +17214,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/library/Makefile.in
 +++ noatun/library/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -292,6 +292,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -572,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13946,7 +17233,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13958,7 +17245,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1100,18 +1103,18 @@
+@@ -1086,18 +1089,18 @@
  mocs: mimetypetree.moc
  
  #>+ 3
@@ -13983,7 +17270,7 @@
  
  #>+ 3
  vequalizer.moc: $(srcdir)/noatun/vequalizer.h
-@@ -1205,18 +1208,18 @@
+@@ -1191,18 +1194,18 @@
  mocs: playlist.moc
  
  #>+ 3
@@ -14008,7 +17295,7 @@
  
  #>+ 3
  effectview.moc: $(srcdir)/effectview.h
-@@ -1250,7 +1253,7 @@
+@@ -1236,7 +1239,7 @@
  
  #>+ 3
  clean-metasources:
@@ -14017,28 +17304,28 @@
  
  #>+ 2
  KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am 
-@@ -1306,7 +1309,7 @@
+@@ -1292,7 +1295,7 @@
  
  
  #>+ 11
--libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp  downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc
-+libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp  downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc
+-libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp  noatunarts/noatunarts.h $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp  noatunarts/noatunarts.h $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp  noatunarts/noatunarts.h $(srcdir)/effects.cpp  noatunarts/noatunarts.h ../../arts/gui/common/artsgui.h $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp  noatunarts/noatunarts.h $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp  downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc
++libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp  noatunarts/noatunarts.h $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp  noatunarts/noatunarts.h $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp  noatunarts/noatunarts.h $(srcdir)/effects.cpp  noatunarts/noatunarts.h ../../arts/gui/common/artsgui.h $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp  noatunarts/noatunarts.h $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp  downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc
  	@echo 'creating libnoatun_la.all_cpp.cpp ...'; \
  	rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
 --- noatun/library/noatun/Makefile.in
 +++ noatun/library/noatun/Makefile.in
-@@ -214,6 +214,9 @@
+@@ -207,6 +207,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -440,7 +443,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14047,7 +17334,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14061,17 +17348,17 @@
  mostlyclean-libtool:
 --- noatun/library/noatunarts/Makefile.in
 +++ noatun/library/noatunarts/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -253,6 +253,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -503,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -14080,7 +17367,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -541,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14094,17 +17381,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/library/noatuntags/Makefile.in
 +++ noatun/library/noatuntags/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -237,6 +237,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14113,7 +17400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14150,17 +17437,17 @@
  am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
  #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
  #>+ 1
-@@ -261,6 +261,9 @@
+@@ -254,6 +254,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,6 +515,7 @@
+@@ -482,6 +485,7 @@
  presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
  updatedir = $(kde_datadir)/kconf_update
  update_DATA = noatun.upd
@@ -14168,7 +17455,7 @@
  noatun20update_SOURCES = noatun20update.cpp
  noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  noatun20update_LDADD = $(LIB_QT)
-@@ -521,7 +525,7 @@
+@@ -491,7 +495,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14177,7 +17464,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -559,34 +563,34 @@
+@@ -529,34 +533,34 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14225,7 +17512,7 @@
  	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
  	  echo " rm -f $$p $$f"; \
  	  rm -f $$p $$f ; \
-@@ -864,7 +868,7 @@
+@@ -834,7 +838,7 @@
  all-am: Makefile $(PROGRAMS) $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
@@ -14234,7 +17521,7 @@
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-recursive
-@@ -895,10 +899,10 @@
+@@ -865,10 +869,10 @@
  #>+ 1
  clean: kde-rpo-clean  clean-recursive
  
@@ -14247,7 +17534,7 @@
  	mostlyclean-am
  
  distclean: distclean-recursive
-@@ -917,11 +921,11 @@
+@@ -887,11 +891,11 @@
  
  info-am:
  
@@ -14263,7 +17550,7 @@
  
  install-exec-am:
  
-@@ -949,32 +953,33 @@
+@@ -919,32 +923,33 @@
  
  ps-am:
  
@@ -14309,55 +17596,45 @@
  
  
  messages:
-@@ -999,26 +1004,26 @@
+@@ -969,12 +974,12 @@
  
  #>+ 22
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/noatun.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/noatun.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/noatun.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+@@ -983,9 +988,9 @@
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/noatun.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
- 
- #>+ 15
- force-reedit:
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/noatun.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/noatun.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/noatun.png
 --- noatun/modules/artseffects/Makefile.in
 +++ noatun/modules/artseffects/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -14366,7 +17643,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14380,17 +17657,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/dcopiface/Makefile.in
 +++ noatun/modules/dcopiface/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -483,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14399,7 +17676,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -521,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14413,17 +17690,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/excellent/Makefile.in
 +++ noatun/modules/excellent/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -245,6 +245,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -488,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14432,7 +17709,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -526,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14446,17 +17723,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/htmlexport/Makefile.in
 +++ noatun/modules/htmlexport/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -480,7 +483,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14465,7 +17742,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -518,9 +521,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14479,17 +17756,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/infrared/Makefile.in
 +++ noatun/modules/infrared/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -483,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14498,7 +17775,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -521,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14512,17 +17789,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kaiman/Makefile.in
 +++ noatun/modules/kaiman/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -260,6 +260,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -509,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14531,7 +17808,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -547,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14543,7 +17820,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -982,22 +985,22 @@
+@@ -952,22 +955,22 @@
  mocs: userinterface.moc
  
  #>+ 3
@@ -14573,7 +17850,7 @@
  
  #>+ 2
  KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am 
-@@ -1048,7 +1051,7 @@
+@@ -1018,7 +1021,7 @@
  
  
  #>+ 11
@@ -14582,7 +17859,7 @@
  	@echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \
  	rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \
-@@ -1091,8 +1094,8 @@
+@@ -1057,8 +1060,8 @@
  nmcheck: 
  userinterface.lo: userinterface.moc 
  nmcheck-am: nmcheck
@@ -14594,17 +17871,17 @@
  pref.o: pref.moc 
 --- noatun/modules/kaiman/skins/car-preset/Makefile.in
 +++ noatun/modules/kaiman/skins/car-preset/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -438,7 +441,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14613,7 +17890,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -476,9 +479,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14627,17 +17904,17 @@
  mostlyclean-libtool:
 --- noatun/modules/kaiman/skins/circle/Makefile.in
 +++ noatun/modules/kaiman/skins/circle/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -440,7 +443,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14646,7 +17923,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14660,17 +17937,17 @@
  mostlyclean-libtool:
 --- noatun/modules/kaiman/skins/k9/Makefile.in
 +++ noatun/modules/kaiman/skins/k9/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -439,7 +442,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14679,7 +17956,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -477,9 +480,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14691,7 +17968,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -668,7 +671,7 @@
+@@ -638,7 +641,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -14702,17 +17979,17 @@
  docs-am:
 --- noatun/modules/kaiman/skins/Makefile.in
 +++ noatun/modules/kaiman/skins/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -437,7 +440,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14721,7 +17998,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -475,9 +478,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14735,17 +18012,17 @@
  mostlyclean-libtool:
 --- noatun/modules/keyz/Makefile.in
 +++ noatun/modules/keyz/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -478,7 +481,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14754,7 +18031,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -516,9 +519,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14768,17 +18045,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kjofol-skin/Makefile.in
 +++ noatun/modules/kjofol-skin/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -266,6 +266,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -537,7 +540,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14787,7 +18064,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -575,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14801,17 +18078,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -435,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14820,7 +18097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14834,17 +18111,17 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -438,7 +441,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14853,7 +18130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -476,9 +479,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14865,7 +18142,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -667,7 +670,7 @@
+@@ -637,7 +640,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -14876,17 +18153,17 @@
  docs-am:
 --- noatun/modules/kjofol-skin/skins/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -436,7 +439,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14895,7 +18172,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14909,17 +18186,17 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/phong/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/phong/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -435,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14928,7 +18205,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14942,17 +18219,17 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -435,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14961,7 +18238,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -473,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14975,17 +18252,17 @@
  mostlyclean-libtool:
 --- noatun/modules/Makefile.in
 +++ noatun/modules/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -440,7 +443,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -14994,7 +18271,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15008,17 +18285,17 @@
  mostlyclean-libtool:
 --- noatun/modules/marquis/Makefile.in
 +++ noatun/modules/marquis/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -483,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15027,7 +18304,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -521,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15041,17 +18318,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/metatag/Makefile.in
 +++ noatun/modules/metatag/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -245,6 +245,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -484,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15060,7 +18337,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -522,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15074,17 +18351,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/monoscope/Makefile.in
 +++ noatun/modules/monoscope/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -480,7 +483,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15093,7 +18370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -518,9 +521,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15107,17 +18384,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/net/Makefile.in
 +++ noatun/modules/net/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -241,6 +241,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -478,7 +481,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15126,7 +18403,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -516,9 +519,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15140,17 +18417,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/noatunui/Makefile.in
 +++ noatun/modules/noatunui/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -245,6 +245,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -485,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15159,7 +18436,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -523,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15173,17 +18450,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/simple/Makefile.in
 +++ noatun/modules/simple/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -484,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15192,7 +18469,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -522,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15206,17 +18483,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/splitplaylist/Makefile.in
 +++ noatun/modules/splitplaylist/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -249,6 +249,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -488,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15225,7 +18502,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -526,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15239,17 +18516,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/systray/Makefile.in
 +++ noatun/modules/systray/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -246,6 +246,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -488,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15258,7 +18535,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -526,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15270,7 +18547,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -875,7 +878,7 @@
+@@ -845,7 +848,7 @@
  	-rm -f  kitsystemtray.moc systray.moc cmodule.moc
  
  #>+ 2
@@ -15281,17 +18558,17 @@
  clean-ui:
 --- noatun/modules/voiceprint/Makefile.in
 +++ noatun/modules/voiceprint/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -481,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15300,7 +18577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -519,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15314,17 +18591,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/winskin/Makefile.in
 +++ noatun/modules/winskin/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -265,6 +265,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -562,7 +565,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15333,7 +18610,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15345,7 +18622,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1117,18 +1120,18 @@
+@@ -1097,18 +1100,18 @@
  mocs: waJumpSlider.moc
  
  #>+ 3
@@ -15370,7 +18647,7 @@
  
  #>+ 3
  waButton.moc: $(srcdir)/waButton.h
-@@ -1173,18 +1176,18 @@
+@@ -1153,18 +1156,18 @@
  mocs: waBalanceSlider.moc
  
  #>+ 3
@@ -15395,7 +18672,7 @@
  
  #>+ 3
  waSkinManager.moc: $(srcdir)/waSkinManager.h
-@@ -1195,10 +1198,10 @@
+@@ -1175,10 +1178,10 @@
  
  #>+ 3
  clean-metasources:
@@ -15408,28 +18685,28 @@
  
  #>+ 4
  clean-idl:
-@@ -1251,7 +1254,7 @@
+@@ -1231,7 +1234,7 @@
  
  
  #>+ 11
--noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp  waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc waIndicator.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
-+noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp  waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
+-noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp  ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp  ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp  ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp  waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc waIndicator.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
++noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp  ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp  ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp  ../../library/noatunarts/noatunarts.h vis/winskinvis.h $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp  waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
  	@echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \
  	rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
 --- noatun/modules/winskin/mimetypes/interface/Makefile.in
 +++ noatun/modules/winskin/mimetypes/interface/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -432,7 +435,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15438,7 +18715,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -470,9 +473,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15452,17 +18729,17 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/mimetypes/Makefile.in
 +++ noatun/modules/winskin/mimetypes/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -436,7 +439,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -15471,7 +18748,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15485,17 +18762,17 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/skins/Makefile.in
 +++ noatun/modules/winskin/skins/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -212,6 +212,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -438,7 +441,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -15504,7 +18781,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -476,9 +479,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15518,17 +18795,17 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/skins/winamp/Makefile.in
 +++ noatun/modules/winskin/skins/winamp/Makefile.in
-@@ -211,6 +211,9 @@
+@@ -204,6 +204,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -436,7 +439,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15537,7 +18814,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15551,17 +18828,17 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/vis/Makefile.in
 +++ noatun/modules/winskin/vis/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -243,6 +243,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -492,7 +495,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -15570,7 +18847,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -530,9 +533,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15584,17 +18861,17 @@
  	@$(NORMAL_INSTALL)
 --- noatun/pics/Makefile.in
 +++ noatun/pics/Makefile.in
-@@ -201,6 +201,9 @@
+@@ -194,6 +194,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -421,7 +424,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15603,7 +18880,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -459,9 +462,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15615,7 +18892,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -634,89 +637,89 @@
+@@ -604,89 +607,89 @@
  .NOEXPORT:
  
  #>+ 2
@@ -15761,17 +19038,17 @@
  force-reedit:
 --- oggvorbis_artsplugin/Makefile.in
 +++ oggvorbis_artsplugin/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -245,6 +245,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -485,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -15780,7 +19057,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -523,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15794,17 +19071,17 @@
  	@$(NORMAL_INSTALL)
 --- xine_artsplugin/Makefile.in
 +++ xine_artsplugin/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -267,6 +267,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -509,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -15813,7 +19090,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -547,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15827,17 +19104,17 @@
  	@$(NORMAL_INSTALL)
 --- xine_artsplugin/tools/Makefile.in
 +++ xine_artsplugin/tools/Makefile.in
-@@ -217,6 +217,9 @@
+@@ -210,6 +210,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -436,7 +439,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -15846,7 +19123,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -474,9 +477,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15860,17 +19137,17 @@
  mostlyclean-libtool:
 --- xine_artsplugin/tools/thumbnail/Makefile.in
 +++ xine_artsplugin/tools/thumbnail/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -246,6 +246,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
 +MAINT = @MAINT@
 +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -484,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15879,7 +19156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -522,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  




More information about the pkg-kde-commits mailing list