rev 3840 - trunk/packages/kdemultimedia/debian/patches

Pierre Habouzit madcoder at costa.debian.org
Wed May 31 22:14:36 UTC 2006


Author: madcoder
Date: 2006-05-31 22:13:42 +0000 (Wed, 31 May 2006)
New Revision: 3840

Modified:
   trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
buildprep pleasure of the day



Modified: trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff	2006-05-31 22:07:15 UTC (rev 3839)
+++ trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff	2006-05-31 22:13:42 UTC (rev 3840)
@@ -28,7 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5970,30 +5958,15 @@
+@@ -5973,30 +5961,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6053,7 +6026,7 @@
+@@ -6056,7 +6029,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -73,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6103,7 +6076,7 @@
+@@ -6106,7 +6079,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6123,7 +6096,7 @@
+@@ -6126,7 +6099,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -91,7 +91,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6143,6 +6116,7 @@
+@@ -6146,6 +6119,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -99,7 +99,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -6162,15 +6136,17 @@
+@@ -6165,15 +6139,17 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -119,7 +119,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6211,11 +6187,56 @@
+@@ -6214,11 +6190,56 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -176,7 +176,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6288,15 +6309,15 @@
+@@ -6291,15 +6312,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -195,7 +195,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6465,14 +6486,13 @@
+@@ -6468,14 +6489,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6484,7 +6504,6 @@
+@@ -6487,7 +6507,6 @@
        esac
        ;;
      *64-bit*)
@@ -220,7 +220,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6518,6 +6537,22 @@
+@@ -6521,6 +6540,22 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -243,7 +243,7 @@
  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
  [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6549,7 +6584,7 @@
+@@ -6552,7 +6587,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -252,7 +252,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6559,8 +6594,10 @@
+@@ -6562,8 +6597,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
@@ -265,7 +265,7 @@
         $2=yes
       fi
     fi
-@@ -6586,11 +6623,16 @@
+@@ -6589,11 +6626,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +283,7 @@
       else
         $2=yes
       fi
-@@ -6614,7 +6656,7 @@
+@@ -6617,7 +6659,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -292,7 +292,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6643,20 +6685,70 @@
+@@ -6646,20 +6688,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -369,7 +369,7 @@
      # Add a significant safety factor because C++ compilers can tack on massive
      # amounts of additional arguments before passing them to the linker.
      # It appears as though 1/2 is a usable value.
-@@ -6673,7 +6765,7 @@
+@@ -6676,7 +6768,7 @@
  
  
  # _LT_AC_CHECK_DLFCN
@@ -378,7 +378,7 @@
  AC_DEFUN([_LT_AC_CHECK_DLFCN],
  [AC_CHECK_HEADERS(dlfcn.h)dnl
  ])# _LT_AC_CHECK_DLFCN
-@@ -6681,7 +6773,7 @@
+@@ -6684,7 +6776,7 @@
  
  # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
  #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +387,7 @@
  AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "$cross_compiling" = yes; then :
-@@ -6747,17 +6839,19 @@
+@@ -6750,17 +6842,19 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -409,7 +409,7 @@
      esac
    else :
      # compilation failed
-@@ -6769,7 +6863,7 @@
+@@ -6772,7 +6866,7 @@
  
  
  # AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +418,7 @@
  AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "x$enable_dlopen" != xyes; then
-@@ -6806,7 +6900,7 @@
+@@ -6809,7 +6903,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -427,7 +427,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6840,7 +6934,7 @@
+@@ -6843,7 +6937,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -436,7 +436,7 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6853,7 +6947,7 @@
+@@ -6856,7 +6950,7 @@
      ])
  
      if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +445,7 @@
        AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
      	  lt_cv_dlopen_self_static, [dnl
  	  _LT_AC_TRY_DLOPEN_SELF(
-@@ -6895,20 +6989,13 @@
+@@ -6898,20 +6992,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -467,7 +467,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6920,13 +7007,18 @@
+@@ -6923,13 +7010,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -490,7 +490,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6985,8 +7077,8 @@
+@@ -6988,8 +7080,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +501,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7043,7 +7135,7 @@
+@@ -7046,7 +7138,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -510,7 +510,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7056,7 +7148,7 @@
+@@ -7059,7 +7151,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -519,7 +519,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7066,7 +7158,20 @@
+@@ -7069,7 +7161,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +541,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7131,7 +7236,7 @@
+@@ -7134,7 +7239,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
    ;;
  
  beos*)
-@@ -7140,7 +7245,7 @@
+@@ -7143,7 +7248,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -559,7 +559,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7156,7 +7261,7 @@
+@@ -7159,7 +7264,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -568,7 +568,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7168,7 +7273,8 @@
+@@ -7171,7 +7276,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7198,7 +7304,7 @@
+@@ -7201,7 +7307,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
        ;;
      esac
      ;;
-@@ -7221,7 +7327,7 @@
+@@ -7224,7 +7330,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +596,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7244,20 +7350,17 @@
+@@ -7247,20 +7353,17 @@
    dynamic_linker=no
    ;;
  
@@ -628,7 +628,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7275,14 +7378,19 @@
+@@ -7278,14 +7381,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -650,7 +650,7 @@
    esac
    ;;
  
-@@ -7302,9 +7410,9 @@
+@@ -7305,9 +7413,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -662,7 +662,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7319,7 +7427,7 @@
+@@ -7322,7 +7430,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -671,7 +671,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7330,7 +7438,7 @@
+@@ -7333,7 +7441,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -680,7 +680,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7342,6 +7450,18 @@
+@@ -7345,6 +7453,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -699,7 +699,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -7385,29 +7505,26 @@
+@@ -7388,29 +7508,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -736,7 +736,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -7417,6 +7534,18 @@
+@@ -7420,6 +7537,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -755,7 +755,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7426,7 +7555,7 @@
+@@ -7429,7 +7558,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -764,7 +764,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7454,8 +7583,13 @@
+@@ -7457,8 +7586,13 @@
  
  openbsd*)
    version_type=sunos
@@ -779,7 +779,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -7475,7 +7609,7 @@
+@@ -7478,7 +7612,7 @@
  
  os2*)
    libname_spec='$name'
@@ -788,7 +788,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7493,13 +7627,6 @@
+@@ -7496,13 +7630,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -802,7 +802,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -7525,7 +7652,7 @@
+@@ -7528,7 +7655,7 @@
    need_version=yes
    ;;
  
@@ -811,7 +811,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7558,6 +7685,29 @@
+@@ -7561,6 +7688,29 @@
    fi
    ;;
  
@@ -841,7 +841,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7571,6 +7721,11 @@
+@@ -7574,6 +7724,11 @@
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
  ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
  
-@@ -7595,6 +7750,9 @@
+@@ -7598,6 +7753,9 @@
        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
      fi
    fi
@@ -863,7 +863,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -7621,7 +7779,9 @@
+@@ -7624,7 +7782,9 @@
  
        case $tagname in
        CXX)
@@ -874,7 +874,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7683,7 +7843,7 @@
+@@ -7686,7 +7846,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -883,7 +883,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7721,7 +7881,7 @@
+@@ -7724,7 +7884,7 @@
  
  # AC_DISABLE_SHARED
  # -----------------
@@ -892,7 +892,7 @@
  AC_DEFUN([AC_DISABLE_SHARED],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_ENABLE_SHARED(no)
-@@ -7857,7 +8017,7 @@
+@@ -7860,7 +8020,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -901,7 +901,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -7967,7 +8127,7 @@
+@@ -7970,7 +8130,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -910,7 +910,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7999,7 +8159,7 @@
+@@ -8002,7 +8162,7 @@
  AC_DEFUN([AC_PROG_LD_GNU],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -919,7 +919,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -8026,6 +8186,15 @@
+@@ -8029,6 +8189,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8059,44 +8228,36 @@
+@@ -8062,44 +8231,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -991,7 +991,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8112,7 +8273,7 @@
+@@ -8115,7 +8276,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +1000,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8128,43 +8289,27 @@
+@@ -8131,43 +8292,27 @@
    esac
    ;;
  
@@ -1057,7 +1057,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
-@@ -8183,32 +8328,22 @@
+@@ -8186,32 +8331,22 @@
    ;;
  
  openbsd*)
@@ -1093,7 +1093,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8229,10 +8364,13 @@
+@@ -8232,10 +8367,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1108,7 +1108,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -8252,36 +8390,43 @@
+@@ -8255,36 +8393,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -1176,7 +1176,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi])
  NM="$lt_cv_path_NM"
-@@ -8313,13 +8458,13 @@
+@@ -8316,13 +8461,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8338,13 +8483,13 @@
+@@ -8341,13 +8486,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1218,7 @@
  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
  AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8382,10 +8527,21 @@
+@@ -8385,10 +8530,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8425,7 +8581,7 @@
+@@ -8428,7 +8584,7 @@
  
  
  # AC_LIBTOOL_RC
@@ -1250,7 +1250,7 @@
  # enable support for Windows resource files
  AC_DEFUN([AC_LIBTOOL_RC],
  [AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8458,36 +8614,9 @@
+@@ -8461,36 +8617,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1290,7 +1290,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -8501,9 +8630,9 @@
+@@ -8504,9 +8633,9 @@
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
  AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1302,7 @@
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
  
-@@ -8512,7 +8641,7 @@
+@@ -8515,7 +8644,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1311,7 +1311,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8521,48 +8650,11 @@
+@@ -8524,48 +8653,11 @@
    fi
    ;;
  
@@ -1362,7 +1362,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8587,7 +8679,7 @@
+@@ -8590,7 +8682,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1371,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8599,6 +8691,7 @@
+@@ -8602,6 +8694,7 @@
  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
  _LT_AC_TAGVAR(module_cmds, $1)=
  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8616,7 +8709,7 @@
+@@ -8619,7 +8712,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1388,7 +1388,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8626,11 +8719,15 @@
+@@ -8629,11 +8722,15 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -1405,7 +1405,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8641,18 +8738,18 @@
+@@ -8644,18 +8741,18 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -1427,7 +1427,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8670,8 +8767,8 @@
+@@ -8673,8 +8770,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -1438,7 +1438,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8697,7 +8794,7 @@
+@@ -8700,7 +8797,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -1447,7 +1447,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8727,8 +8824,23 @@
+@@ -8730,8 +8827,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1473,7 +1473,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8745,7 +8857,7 @@
+@@ -8748,7 +8860,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1482,7 +1482,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -8764,8 +8876,12 @@
+@@ -8767,8 +8879,12 @@
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
@@ -1495,7 +1495,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8774,15 +8890,16 @@
+@@ -8777,15 +8893,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1516,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.
-@@ -8791,13 +8908,12 @@
+@@ -8794,13 +8911,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1532,7 +1532,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8806,22 +8922,32 @@
+@@ -8809,22 +8925,32 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1576,7 @@
      esac
      ;;
  
-@@ -8829,12 +8955,12 @@
+@@ -8832,12 +8958,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1591,7 +1591,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
-@@ -8843,70 +8969,81 @@
+@@ -8846,70 +8972,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1725,7 +1725,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8917,14 +9054,14 @@
+@@ -8920,14 +9057,14 @@
  	;;
      esac
      ;;
@@ -1742,7 +1742,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8941,12 +9078,12 @@
+@@ -8944,12 +9081,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1758,7 +1758,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8955,11 +9092,11 @@
+@@ -8958,11 +9095,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -1772,7 +1772,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8969,34 +9106,23 @@
+@@ -8972,34 +9109,23 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1814,7 +1814,7 @@
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9006,17 +9132,20 @@
+@@ -9009,17 +9135,20 @@
      esac
  
      case $cc_basename in
@@ -1841,7 +1841,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -9032,12 +9161,15 @@
+@@ -9035,12 +9164,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -9048,11 +9180,25 @@
+@@ -9051,11 +9183,25 @@
  	;;
      esac
      ;;
@@ -1889,7 +1889,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9063,9 +9209,9 @@
+@@ -9066,9 +9212,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1901,7 +1901,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9074,16 +9220,16 @@
+@@ -9077,16 +9223,16 @@
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
@@ -1922,7 +1922,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9101,20 +9247,44 @@
+@@ -9104,20 +9250,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1973,7 +1973,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9142,7 +9312,7 @@
+@@ -9145,7 +9315,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1982,7 +1982,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9152,7 +9322,7 @@
+@@ -9155,7 +9325,7 @@
  	;;
      esac
      ;;
@@ -1991,7 +1991,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -9163,15 +9333,31 @@
+@@ -9166,15 +9336,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -2025,7 +2025,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9181,14 +9367,14 @@
+@@ -9184,14 +9370,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -2043,7 +2043,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9206,7 +9392,7 @@
+@@ -9209,7 +9395,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9225,13 +9411,13 @@
+@@ -9228,13 +9414,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -2068,7 +2068,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,17 +9426,17 @@
+@@ -9243,17 +9429,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -2090,7 +2090,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9269,7 +9455,7 @@
+@@ -9272,7 +9458,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9290,27 +9476,14 @@
+@@ -9293,27 +9479,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -2129,7 +2129,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9323,36 +9496,33 @@
+@@ -9326,36 +9499,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -2178,7 +2178,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9360,9 +9530,9 @@
+@@ -9363,9 +9533,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -2190,7 +2190,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9372,9 +9542,9 @@
+@@ -9375,9 +9545,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2202,7 +2202,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9383,9 +9553,9 @@
+@@ -9386,9 +9556,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -2214,7 +2214,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9398,12 +9568,63 @@
+@@ -9401,12 +9571,63 @@
  	;;
      esac
      ;;
@@ -2280,7 +2280,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9440,8 +9661,6 @@
+@@ -9443,8 +9664,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2289,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9459,7 +9678,7 @@
+@@ -9462,7 +9681,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2298,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -9513,7 +9732,7 @@
+@@ -9516,7 +9735,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -2307,7 +2307,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9553,7 +9772,7 @@
+@@ -9556,7 +9775,7 @@
         fi
         ;;
  
@@ -2316,7 +2316,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9589,13 +9808,37 @@
+@@ -9592,13 +9811,37 @@
  
  $rm -f confest.$objext
  
@@ -2355,7 +2355,7 @@
  # Ensure that the configuration vars for the C compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9639,12 +9882,16 @@
+@@ -9642,12 +9885,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2373,7 +2373,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9654,7 +9901,7 @@
+@@ -9657,7 +9904,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2382,7 +2382,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9662,8 +9909,10 @@
+@@ -9665,8 +9912,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2395,7 +2395,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9673,8 +9922,6 @@
+@@ -9676,8 +9925,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2404,7 +2404,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -9684,8 +9931,6 @@
+@@ -9687,8 +9934,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2413,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9714,20 +9959,27 @@
+@@ -9717,20 +9962,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2442,7 +2442,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -9739,8 +9991,6 @@
+@@ -9742,8 +9994,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2451,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9750,7 +10000,7 @@
+@@ -9753,7 +10003,7 @@
  
  
  # AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2460,7 @@
  # Ensure that the configuration vars for the Windows resource compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9774,11 +10024,16 @@
+@@ -9777,11 +10027,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2477,7 +2477,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9804,11 +10059,12 @@
+@@ -9807,11 +10062,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2492,7 +2492,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 \
-@@ -9858,7 +10114,7 @@
+@@ -9861,7 +10117,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2501,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9924,11 +10180,11 @@
+@@ -9927,11 +10183,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2515,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9959,6 +10215,12 @@
+@@ -9962,6 +10218,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2528,7 +2528,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9970,6 +10232,9 @@
+@@ -9973,6 +10235,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2538,7 +2538,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -9989,7 +10254,7 @@
+@@ -9992,7 +10257,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2547,7 +2547,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -10020,7 +10285,7 @@
+@@ -10023,7 +10288,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10035,7 +10300,7 @@
+@@ -10038,7 +10303,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2565,7 +2565,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10264,7 +10529,10 @@
+@@ -10267,7 +10532,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -2577,7 +2577,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10306,9 +10574,6 @@
+@@ -10309,9 +10577,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2587,7 +2587,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -10330,14 +10595,30 @@
+@@ -10333,14 +10598,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -2620,7 +2620,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10355,14 +10636,17 @@
+@@ -10358,14 +10639,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10518,6 +10802,10 @@
+@@ -10521,6 +10805,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2651,7 +2651,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10526,7 +10814,7 @@
+@@ -10529,7 +10817,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2660,7 +2660,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10551,18 +10839,28 @@
+@@ -10554,18 +10842,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2692,7 +2692,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10570,22 +10868,22 @@
+@@ -10573,22 +10871,22 @@
  	    ;;
  	esac
  	;;
@@ -2721,7 +2721,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10598,9 +10896,13 @@
+@@ -10601,9 +10899,13 @@
  	    ;;
  	esac
  	;;
@@ -2736,7 +2736,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -10609,20 +10911,26 @@
+@@ -10612,20 +10914,26 @@
  	    ;;
  	esac
  	;;
@@ -2768,7 +2768,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10639,25 +10947,25 @@
+@@ -10642,25 +10950,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2799,7 +2799,7 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10671,24 +10979,15 @@
+@@ -10674,24 +10982,15 @@
  	;;
        psos*)
  	;;
@@ -2826,7 +2826,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10698,12 +10997,12 @@
+@@ -10701,12 +11000,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2841,7 +2841,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10713,7 +11012,7 @@
+@@ -10716,7 +11015,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2850,7 +2850,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10721,7 +11020,14 @@
+@@ -10724,7 +11023,14 @@
  	    ;;
  	esac
  	;;
@@ -2866,7 +2866,7 @@
  	;;
        vxworks*)
  	;;
-@@ -10768,6 +11074,11 @@
+@@ -10771,6 +11077,11 @@
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
        ;;
  
@@ -2878,7 +2878,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -10784,7 +11095,7 @@
+@@ -10787,7 +11098,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2887,7 +2887,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10810,6 +11121,16 @@
+@@ -10813,6 +11124,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2904,7 +2904,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10821,7 +11142,7 @@
+@@ -10824,7 +11145,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2913,7 +2913,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10844,13 +11165,20 @@
+@@ -10847,13 +11168,20 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2936,7 +2936,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10865,15 +11193,15 @@
+@@ -10868,15 +11196,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2958,7 +2958,7 @@
        ;;
  
      sunos4*)
-@@ -10882,7 +11210,7 @@
+@@ -10885,7 +11213,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2967,7 +2967,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10895,6 +11223,17 @@
+@@ -10898,6 +11226,17 @@
        fi
        ;;
  
@@ -2985,7 +2985,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10922,7 +11261,7 @@
+@@ -10925,7 +11264,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2994,7 +2994,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10931,6 +11270,16 @@
+@@ -10934,6 +11273,16 @@
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -3011,7 +3011,7 @@
  ])
  
  
-@@ -10955,7 +11304,10 @@
+@@ -10958,7 +11307,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -3023,7 +3023,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10981,7 +11333,7 @@
+@@ -10984,7 +11336,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3032,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10998,7 +11350,8 @@
+@@ -11001,7 +11353,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11008,6 +11361,10 @@
+@@ -11011,6 +11364,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -3053,7 +3053,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -11018,6 +11375,27 @@
+@@ -11021,6 +11378,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -3081,7 +3081,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11055,7 +11433,7 @@
+@@ -11058,7 +11436,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -3090,7 +3090,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11065,13 +11443,13 @@
+@@ -11068,13 +11446,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3107,7 +3107,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
-@@ -11080,23 +11458,70 @@
+@@ -11083,23 +11461,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -3184,7 +3184,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<EOF 1>&2
-@@ -11110,13 +11535,40 @@
+@@ -11113,13 +11538,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3227,7 @@
      sunos4*)
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -11126,24 +11578,19 @@
+@@ -11129,24 +11581,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3259,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11155,7 +11602,7 @@
+@@ -11158,7 +11605,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3268,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11177,9 +11624,21 @@
+@@ -11180,9 +11627,21 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -3292,7 +3292,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11196,7 +11655,7 @@
+@@ -11199,7 +11658,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3301,7 +3301,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -11215,8 +11674,12 @@
+@@ -11218,8 +11677,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3314,7 +3314,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11224,30 +11687,30 @@
+@@ -11227,30 +11690,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3356,7 +3356,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11256,13 +11719,11 @@
+@@ -11259,13 +11722,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3373,7 @@
  	fi
        fi
        ;;
-@@ -11275,7 +11736,7 @@
+@@ -11278,7 +11739,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3382,7 +3382,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11285,69 +11746,69 @@
+@@ -11288,69 +11749,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
        ;;
  
      dgux*)
-@@ -11380,8 +11841,8 @@
+@@ -11383,8 +11844,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3509,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11850,7 @@
+@@ -11392,7 +11853,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -3518,7 +3518,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11403,47 +11864,62 @@
+@@ -11406,47 +11867,62 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        ;;
  
@@ -3605,7 +3605,7 @@
  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
-@@ -11457,7 +11933,7 @@
+@@ -11460,7 +11936,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -3614,7 +3614,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'
-@@ -11467,7 +11943,7 @@
+@@ -11470,7 +11946,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -3623,7 +3623,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11490,7 +11966,8 @@
+@@ -11493,7 +11969,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3633,7 +3633,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11500,7 +11977,7 @@
+@@ -11503,7 +11980,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -3642,7 +3642,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11511,14 +11988,14 @@
+@@ -11514,14 +11991,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3659,7 +3659,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'
-@@ -11530,13 +12007,13 @@
+@@ -11533,13 +12010,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3675,7 +3675,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11544,21 +12021,15 @@
+@@ -11547,21 +12024,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3701,7 +3701,7 @@
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11567,8 +12038,18 @@
+@@ -11570,8 +12041,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3722,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11577,7 +12058,7 @@
+@@ -11580,7 +12061,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -3731,7 +3731,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11625,36 +12106,45 @@
+@@ -11628,36 +12109,45 @@
        fi
        ;;
  
@@ -3798,7 +3798,7 @@
        ;;
  
      uts4*)
-@@ -11672,11 +12162,6 @@
+@@ -11675,11 +12165,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3810,7 +3810,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -11697,13 +12182,14 @@
+@@ -11700,13 +12185,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -11831,7 +12317,7 @@
+@@ -11834,7 +12320,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3835,47 +3835,17 @@
    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 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# 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.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
- # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- akode_artsplugin/Makefile.in
 +++ akode_artsplugin/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -162,6 +162,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -253,6 +254,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3885,7 +3855,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -308,18 +312,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -355,14 +357,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -444,6 +450,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -458,8 +465,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -510,7 +519,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -3894,7 +3922,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,9 +557,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3906,18 +3934,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -887,7 +890,7 @@
- 
- 
- #>+ 2
--KDE_DIST=akodeXiphPlayObject_impl.h Makefile.in akodeMPCPlayObject_impl.h akodeSpeexStreamPlayObject_impl.h akodearts.idl akodeMPEGPlayObject.mcopclass akodeFFMPEGPlayObject.mcopclass akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h akodeMPCPlayObject.mcopclass 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 akodeMPEGPlayObject.mcopclass akodeFFMPEGPlayObject.mcopclass akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h akodeMPCPlayObject.mcopclass configure.in.in akodeFFMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h 
- 
- #>+ 3
- clean-closures:
 --- arts/builder/Makefile.in
 +++ arts/builder/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -183,6 +183,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -274,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3927,7 +3954,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -329,18 +333,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -376,14 +378,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -465,6 +471,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -479,8 +486,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -538,7 +547,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -3936,7 +4021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -576,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3948,18 +4033,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1079,7 +1082,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 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
-@@ -217,6 +217,9 @@
+@@ -126,6 +126,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -217,6 +218,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3969,7 +4053,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -272,18 +276,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -319,14 +321,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -408,6 +414,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -422,8 +429,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -460,7 +469,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -3978,7 +4120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -498,9 +507,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3990,18 +4132,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -663,7 +666,7 @@
- .NOEXPORT:
- 
- #>+ 2
--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:
 --- arts/examples/Makefile.in
 +++ arts/examples/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -115,6 +115,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -206,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4011,7 +4152,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -261,18 +265,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -308,14 +310,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -397,6 +403,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -411,8 +418,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -509,7 +518,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -4020,7 +4219,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -547,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4032,18 +4231,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -728,7 +731,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=example_cflanger.arts example_moog.arts instrument_slide.arts example_pulse.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts example_equalizer.arts example_pitchshift.arts mixer_element_eq.arts example_record.arts example_bus.arts instrument_neworgan.arts example_tri.arts example_cdelay.arts instrument_simple_sin.arts example_stereobeep.arts example_autopanner.arts instrument_full_square.arts template_Mixer_Element.arts effect_flanger_alone.arts example_atan_saturate.arts example_pscale.arts instrument_organ2.arts instrument_deepdrum.arts example_brickwall.arts example_dtmf1.arts example_square.arts example_capture_wav.arts instrument_flexible_slide.arts instrument_slide1.arts instrument_moog_vcf_tune.arts instrument_fm_horn.arts template_Instrument.arts instrument_square.arts instrument_chirpdrum.arts instrument_arts_all.arts-map checknames.sh Makefile.in instrument_flexible_slide_GUI.arts example_data.arts instrument_simple_tri.arts example_delay.arts example_noise.arts example_softsaw.arts example_shelve_cutoff.arts mixer_element_simple.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts mixer_element_eqfx.arts instrument_hihat.arts template_Empty_Structure.arts instrument_moog_vcf_tune_GUI.arts example_freeverb.arts example_sine.arts effect_delay_alone.arts example_xfade.arts example_adsr.arts Makefile.am example_rc.arts 
-+KDE_DIST=instrument_deepdrum.arts example_moog.arts example_brickwall.arts example_cflanger.arts instrument_slide.arts example_pulse.arts example_dtmf1.arts example_square.arts example_capture_wav.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts instrument_slide1.arts instrument_flexible_slide.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts instrument_moog_vcf_tune.arts example_equalizer.arts instrument_fm_horn.arts template_Instrument.arts example_pitchshift.arts example_record.arts mixer_element_eq.arts example_bus.arts instrument_neworgan.arts example_tri.arts instrument_square.arts example_cdelay.arts instrument_arts_all.arts-map instrument_chirpdrum.arts checknames.sh example_stereobeep.arts instrument_simple_sin.arts example_autopanner.arts Makefile.in instrument_flexible_slide_GUI.arts example_data.arts instrument_simple_tri.arts example_delay.arts example_noise.arts instrument_full_square.arts template_Mixer_Element.arts example_shelve_cutoff.arts example_softsaw.arts mixer_element_simple.arts effect_flanger_alone.arts example_atan_saturate.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts mixer_element_eqfx.arts instrument_hihat.arts template_Empty_Structure.arts effect_delay_alone.arts instrument_moog_vcf_tune_GUI.arts example_freeverb.arts example_pscale.arts example_sine.arts example_xfade.arts example_adsr.arts instrument_organ2.arts Makefile.am example_rc.arts 
- 
- #>+ 2
- docs-am:
 --- arts/gui/common/Makefile.in
 +++ arts/gui/common/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -156,6 +156,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -247,6 +248,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4053,7 +4251,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -302,18 +306,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -349,14 +351,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -438,6 +444,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -452,8 +459,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -508,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -4062,7 +4318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4076,7 +4332,15 @@
  	@$(NORMAL_INSTALL)
 --- arts/gui/kde/Makefile.in
 +++ arts/gui/kde/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -194,6 +194,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -285,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4086,7 +4350,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -340,18 +344,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -387,14 +389,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -476,6 +482,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -490,8 +497,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -553,7 +562,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -4095,7 +4417,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4107,81 +4429,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1099,18 +1102,18 @@
- mocs: kcombobox_impl.moc
- 
- #>+ 3
--klevelmeter_normalbars.moc: $(srcdir)/klevelmeter_normalbars.h
--	$(MOC) $(srcdir)/klevelmeter_normalbars.h -o klevelmeter_normalbars.moc
-+klineedit_impl.moc: $(srcdir)/klineedit_impl.h
-+	$(MOC) $(srcdir)/klineedit_impl.h -o klineedit_impl.moc
- 
- #>+ 2
--mocs: klevelmeter_normalbars.moc
-+mocs: klineedit_impl.moc
- 
- #>+ 3
--klineedit_impl.moc: $(srcdir)/klineedit_impl.h
--	$(MOC) $(srcdir)/klineedit_impl.h -o klineedit_impl.moc
-+klevelmeter_normalbars.moc: $(srcdir)/klevelmeter_normalbars.h
-+	$(MOC) $(srcdir)/klevelmeter_normalbars.h -o klevelmeter_normalbars.moc
- 
- #>+ 2
--mocs: klineedit_impl.moc
-+mocs: klevelmeter_normalbars.moc
- 
- #>+ 3
- kbutton_impl.moc: $(srcdir)/kbutton_impl.h
-@@ -1134,18 +1137,18 @@
- mocs: kpoti.moc
- 
- #>+ 3
--kfader_impl.moc: $(srcdir)/kfader_impl.h
--	$(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
-+klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
-+	$(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
- 
- #>+ 2
--mocs: kfader_impl.moc
-+mocs: klevelmeter_linebars.moc
- 
- #>+ 3
--klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
--	$(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
-+kfader_impl.moc: $(srcdir)/kfader_impl.h
-+	$(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
- 
- #>+ 2
--mocs: klevelmeter_linebars.moc
-+mocs: kfader_impl.moc
- 
- #>+ 3
- kpoti_impl.moc: $(srcdir)/kpoti_impl.h
-@@ -1177,10 +1180,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  klabel_impl.moc kvolumefader_impl.moc klayoutbox_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc dbtest.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
-+	-rm -f  klabel_impl.moc kvolumefader_impl.moc klayoutbox_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc dbtest.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
- 
- #>+ 2
--KDE_DIST=dbtest.h kbutton_impl.h klevelmeter_linebars.h klevelmeter_firebars.h khbox_impl.h klevelmeter_normalbars.h kvbox_impl.h kpopupbox_impl.h kfader_impl.h klevelmeter_small.h klevelmeter_private.h kvolumefader_impl.h kgraph.h klevelmeter_template.h dbvolcalc.h klabel_impl.h kpopupbox_private.h kgraphline_impl.h ktickmarks_impl.h Makefile.in kfader.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h 
-+KDE_DIST=klevelmeter_private.h dbtest.h kbutton_impl.h kvolumefader_impl.h klevelmeter_linebars.h klevelmeter_firebars.h kgraph.h khbox_impl.h klevelmeter_template.h dbvolcalc.h klabel_impl.h klevelmeter_normalbars.h kpopupbox_private.h kvbox_impl.h kgraphline_impl.h kpopupbox_impl.h ktickmarks_impl.h Makefile.in kfader_impl.h kfader.h klevelmeter_small.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h 
- 
- #>+ 3
- clean-closures:
-@@ -1228,7 +1231,7 @@
- 
- 
- #>+ 11
--libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp  klayoutbox_impl.moc kvolumefader_impl.moc klabel_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
-+libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp  klayoutbox_impl.moc kvolumefader_impl.moc klabel_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
- 	@echo 'creating libartsgui_kde_la.all_cpp.cpp ...'; \
- 	rm -f libartsgui_kde_la.all_cpp.files libartsgui_kde_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
 --- arts/gui/kde/mcopclass/Makefile.in
 +++ arts/gui/kde/mcopclass/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4191,7 +4449,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -443,7 +452,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -4200,7 +4516,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4212,18 +4528,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -643,7 +646,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=LevelMeter.mcopclass Button.mcopclass PopupBox.mcopclass HBox.mcopclass LineEdit.mcopclass Fader.mcopclass Widget.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass Graph.mcopclass Label.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass 
-+KDE_DIST=LevelMeter.mcopclass Button.mcopclass Widget.mcopclass PopupBox.mcopclass HBox.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass LineEdit.mcopclass Graph.mcopclass Label.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass Fader.mcopclass 
- 
- #>+ 2
- docs-am:
 --- arts/gui/Makefile.in
 +++ arts/gui/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -118,6 +118,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -209,6 +210,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4233,7 +4548,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -264,18 +268,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -311,14 +313,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -400,6 +406,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -414,8 +421,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -4242,7 +4615,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4256,7 +4629,15 @@
  mostlyclean-libtool:
 --- arts/Makefile.in
 +++ arts/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -118,6 +118,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -209,6 +210,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4266,7 +4647,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -264,18 +268,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -311,14 +313,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -400,6 +406,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -414,8 +421,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -4275,7 +4714,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4289,7 +4728,15 @@
  mostlyclean-libtool:
 --- arts/midi/Makefile.in
 +++ arts/midi/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -212,6 +212,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -303,6 +304,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4299,7 +4746,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -358,18 +362,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -405,14 +407,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -494,6 +500,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -508,8 +515,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -4308,7 +4813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4320,18 +4825,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1129,7 +1132,7 @@
- 
- 
- #>+ 2
--KDE_DIST=alsamidiport_impl.h midimanager_impl.h miditimercommon.h midimsg.h audiotimer.h midisyncgroup_impl.h midimanagerport_impl.h midisend.h README.midi audiosync_impl.h Makefile.in midiclient_impl.h timestampmath.h Makefile.am 
-+KDE_DIST=midimanagerport_impl.h midisend.h alsamidiport_impl.h README.midi midimanager_impl.h miditimercommon.h midimsg.h audiosync_impl.h midiclient_impl.h Makefile.in timestampmath.h audiotimer.h midisyncgroup_impl.h Makefile.am 
- 
- #>+ 3
- clean-closures:
 --- arts/midi/mcopclass/Makefile.in
 +++ arts/midi/mcopclass/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4341,7 +4845,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -4350,7 +4912,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4364,7 +4926,15 @@
  mostlyclean-libtool:
 --- arts/modules/common/Makefile.in
 +++ arts/modules/common/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -169,6 +169,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -260,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4374,7 +4944,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -315,18 +319,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -362,14 +364,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -451,6 +457,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -465,8 +472,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -539,7 +548,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -4383,7 +5011,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4397,7 +5025,15 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/effects/freeverb/Makefile.in
 +++ arts/modules/effects/freeverb/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -136,6 +136,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -227,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4407,7 +5043,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -282,18 +286,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -329,14 +331,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -418,6 +424,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -432,8 +439,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -463,7 +472,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -4416,7 +5110,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +510,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4428,18 +5122,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -734,7 +737,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=tuning.h readme.txt denormals.h comb.hpp revmodel.hpp Makefile.in allpass.hpp Makefile.am 
-+KDE_DIST=tuning.h readme.txt revmodel.hpp Makefile.in denormals.h allpass.hpp Makefile.am comb.hpp 
- 
- #>+ 2
- docs-am:
 --- arts/modules/effects/Makefile.in
 +++ arts/modules/effects/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -192,6 +192,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -283,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4449,7 +5142,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -338,18 +342,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -385,14 +387,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -474,6 +480,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -488,8 +495,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -4458,7 +5209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4472,7 +5223,15 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/Makefile.in
 +++ arts/modules/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -174,6 +174,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -265,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4482,7 +5241,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -320,18 +324,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -367,14 +369,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -456,6 +462,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -470,8 +477,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -549,7 +558,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -4491,7 +5308,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -587,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4503,18 +5320,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1001,7 +1004,7 @@
- 
- 
- #>+ 2
--KDE_DIST=README.subdirs README.modules Makefile.in README.environments Makefile.am 
-+KDE_DIST=README.modules README.subdirs Makefile.in README.environments Makefile.am 
- 
- #>+ 3
- clean-closures:
 --- arts/modules/mixers/Makefile.in
 +++ arts/modules/mixers/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -167,6 +167,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -258,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4524,7 +5340,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -313,18 +317,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -360,14 +362,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -449,6 +455,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -463,8 +470,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -546,7 +555,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -4533,7 +5407,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -584,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4547,7 +5421,15 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/synth/Makefile.in
 +++ arts/modules/synth/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -197,6 +197,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -288,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4557,7 +5439,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -343,18 +347,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -390,14 +392,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -479,6 +485,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -493,8 +500,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -578,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -4566,7 +5506,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4580,7 +5520,15 @@
  	@$(NORMAL_INSTALL)
 --- arts/runtime/Makefile.in
 +++ arts/runtime/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -164,6 +164,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -255,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4590,7 +5538,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -310,18 +314,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -357,14 +359,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -446,6 +452,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -460,8 +467,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -4599,7 +5605,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +564,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4611,18 +5617,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -890,7 +893,7 @@
- 
- 
- #>+ 2
--KDE_DIST=StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h LocalFactory.mcopclass moduleinfo.h Makefile.in Makefile.am 
-+KDE_DIST=LocalFactory.mcopclass moduleinfo.h Makefile.in StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h Makefile.am 
- 
- #>+ 3
- clean-closures:
 --- arts/tools/Makefile.in
 +++ arts/tools/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -200,6 +200,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -291,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4632,7 +5637,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -346,18 +350,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -393,14 +395,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -482,6 +488,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -496,8 +503,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -4641,7 +5704,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4653,47 +5716,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1168,18 +1171,18 @@
- mocs: audiomanager.moc
- 
- #>+ 3
--artscontrolapplet.moc: $(srcdir)/artscontrolapplet.h
--	$(MOC) $(srcdir)/artscontrolapplet.h -o artscontrolapplet.moc
-+midimanagerview.moc: $(srcdir)/midimanagerview.h
-+	$(MOC) $(srcdir)/midimanagerview.h -o midimanagerview.moc
- 
- #>+ 2
--mocs: artscontrolapplet.moc
-+mocs: midimanagerview.moc
- 
- #>+ 3
--midimanagerview.moc: $(srcdir)/midimanagerview.h
--	$(MOC) $(srcdir)/midimanagerview.h -o midimanagerview.moc
-+artscontrolapplet.moc: $(srcdir)/artscontrolapplet.h
-+	$(MOC) $(srcdir)/artscontrolapplet.h -o artscontrolapplet.moc
- 
- #>+ 2
--mocs: midimanagerview.moc
-+mocs: artscontrolapplet.moc
- 
- #>+ 3
- choosebusdlg.moc: $(srcdir)/choosebusdlg.h
-@@ -1248,10 +1251,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  mediatypesview.moc statusview.moc templateview.moc artsactions.moc audiomanager.moc artscontrolapplet.moc midimanagerview.moc choosebusdlg.moc main.moc midiinstdlg.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
-+	-rm -f  mediatypesview.moc statusview.moc templateview.moc artsactions.moc audiomanager.moc midimanagerview.moc artscontrolapplet.moc choosebusdlg.moc main.moc midiinstdlg.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
- 
- #>+ 2
--KDE_DIST=artscontrolapplet_private.h midiportdlg.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h main.h midimanagerdlg.ui artscontrolapplet.desktop midimanagerwidget.ui statusview.h artscontrolapplet.h environmentview.h templateview.h mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc Makefile.am choosebusdlg.h 
-+KDE_DIST=artscontrolapplet_private.h midiportdlg.h artscontrolapplet.h environmentview.h templateview.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h main.h midimanagerdlg.ui mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc midimanagerwidget.ui artscontrolapplet.desktop statusview.h Makefile.am choosebusdlg.h 
- 
- #>+ 5
- clean-ui:
 --- arts/tools/pics/Makefile.in
 +++ arts/tools/pics/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4703,7 +5736,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -4712,7 +5803,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -466,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4724,198 +5815,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -611,113 +614,113 @@
- .NOEXPORT:
- 
- #>+ 2
--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:
- 
- #>+ 102
- install-kde-icons:
--	$(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/64x64/actions
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.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
-+	$(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)/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
-+	$(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-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)/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
-+	$(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)/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
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
-+	$(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)/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
--	$(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)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/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)/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/64x64/actions/artsmidimanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.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/16x16/actions/artsfftscope.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.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/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/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)/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/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)/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/48x48/actions/artsmidimanager.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/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)/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/16x16/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
-@@ -245,6 +245,9 @@
+@@ -154,6 +154,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -245,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -4925,7 +5835,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -300,18 +304,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -347,14 +349,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -436,6 +442,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -450,8 +457,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -494,7 +503,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -4934,7 +5902,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -532,9 +541,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4946,15 +5914,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -862,7 +865,7 @@
- 
- 
- #>+ 2
--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
 @@ -269,9 +269,6 @@
@@ -4967,10 +5926,680 @@
  /* Suffix for lib directories */
  #undef KDELIBSUFF
  
+@@ -317,22 +314,22 @@
+ /* Define as the return type of signal handlers (`int' or `void'). */
+ #undef RETSIGTYPE
+ 
+-/* The size of a `char *', as computed by sizeof. */
++/* The size of `char *', as computed by sizeof. */
+ #undef SIZEOF_CHAR_P
+ 
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+ 
+-/* The size of a `size_t', as computed by sizeof. */
++/* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
+ 
+-/* The size of a `unsigned long', as computed by sizeof. */
++/* The size of `unsigned long', as computed by sizeof. */
+ #undef SIZEOF_UNSIGNED_LONG
+ 
+ /* Define to 1 if you have the ANSI C header files. */
 --- configure
 +++ configure
-@@ -278,15 +278,15 @@
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.59d.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+@@ -16,11 +17,35 @@
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
  
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -29,8 +54,43 @@
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44,18 +104,19 @@
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -63,157 +124,386 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
++# CDPATH.
++$as_unset CDPATH
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++  if (eval ":") 2>/dev/null; then
++  as_have_required=yes
++else
++  as_have_required=no
+ fi
+ 
++  if test $as_have_required = yes && 	 (eval ":
++(as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0) || { (exit 1); exit 1; }
++
++(
++  as_lineno_1=\$LINENO
++  as_lineno_2=\$LINENO
++  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++  :
++else
++  as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
++  case $as_dir in
+ 	 /*)
+-	   if ("$as_dir/$as_base" -c '
++	   for as_base in sh bash ksh sh5; do
++	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++	   done;;
++       esac
++done
++IFS=$as_save_IFS
++
++
++      for as_shell in $as_candidate_shells $SHELL; do
++	 # Try only shells which exist, to save several forks.
++	 if test -f "$as_shell" &&
++		{ ("$as_shell") 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++_ASEOF
++}; then
++  CONFIG_SHELL=$as_shell
++	       as_have_required=yes
++	       if { "$as_shell" 2> /dev/null <<\_ASEOF
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
++:
++(as_func_return () {
++  (exit $1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++  break
++fi
++
++fi
++
++      done
++
++      if test "x$CONFIG_SHELL" != x; then
++  for as_var in BASH_ENV ENV
++        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++        done
++        export CONFIG_SHELL
++        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++    if test $as_have_required = no; then
++  echo This script requires a shell more modern than all the
++      echo shells that I found on your system.  Please install a
++      echo modern shell, or manually run the script under such a
++      echo shell if you do have one.
++      { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++  echo No shell found that supports shell functions.
++  echo Please tell autoconf at gnu.org about your system,
++  echo including any error possibly output before this
++  echo message
++}
++
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
++  chmod +x "$as_me.lineno" ||
+     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (dirname -- /) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -222,7 +512,19 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++  as_executable_p="test -x"
++else
++  as_executable_p=:
++fi
++rm -f conf$$.file
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -231,15 +533,6 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ 
+ 
+ # Check that we are running under the correct shell.
+@@ -278,15 +571,15 @@
+ 
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
 -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -4988,16 +6617,887 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -464,7 +464,7 @@
+@@ -395,29 +688,26 @@
+ 
+ tagnames=${tagnames+${tagnames},}F77
+ 
++exec 7<&0 </dev/null 6>&1
++
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+@@ -455,17 +745,413 @@
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
++#endif
++#if HAVE_STDINT_H
++# include <stdint.h>
+ #endif
+ #if HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO 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 include_akode_mpeg_TRUE include_akode_mpeg_FALSE include_akode_mpc_TRUE include_akode_mpc_FALSE include_akode_xiph_TRUE include_akode_xiph_FALSE include_akode_ffmpeg_TRUE include_akode_ffmpeg_FALSE 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 include_akode_mpeg_TRUE include_akode_mpeg_FALSE include_akode_mpc_TRUE include_akode_mpc_FALSE include_akode_xiph_TRUE include_akode_xiph_FALSE include_akode_ffmpeg_TRUE include_akode_ffmpeg_FALSE 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 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 include_akode_mpeg_TRUE include_akode_mpeg_FALSE include_akode_mpc_TRUE include_akode_mpc_FALSE include_akode_xiph_TRUE include_akode_xiph_FALSE include_akode_ffmpeg_TRUE include_akode_ffmpeg_FALSE LIB_ARTS ARTS_CFLAGS 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 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
++datarootdir
++datadir
++sysconfdir
++sharedstatedir
++localstatedir
++includedir
++oldincludedir
++docdir
++infodir
++htmldir
++dvidir
++pdfdir
++psdir
++libdir
++localedir
++mandir
++DEFS
++ECHO_C
++ECHO_N
++ECHO_T
++LIBS
++build_alias
++host_alias
++target_alias
++build
++build_cpu
++build_vendor
++build_os
++host
++host_cpu
++host_vendor
++host_os
++target
++target_cpu
++target_vendor
++target_os
++INSTALL_PROGRAM
++INSTALL_SCRIPT
++INSTALL_DATA
++CYGPATH_W
++PACKAGE
++VERSION
++ACLOCAL
++AUTOCONF
++AUTOMAKE
++AUTOHEADER
++MAKEINFO
++install_sh
++STRIP
++INSTALL_STRIP_PROGRAM
++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
++GREP
++EGREP
++LN_S
++ECHO
++AR
++RANLIB
++F77
++FFLAGS
++ac_ct_F77
++LIBTOOL
++KDE_PLUGIN
++KDE_CHECK_PLUGIN
++MSGFMT
++GMSGFMT
++XGETTEXT
++LIBUTIL
++LIBCOMPAT
++LIBCRYPT
++LIBRESOLV
++LIB_POLL
++FRAMEWORK_COREAUDIO
++LIBSOCKET
++X_EXTRA_LIBS
++LIBUCB
++LIBDL
++KDE_USE_FPIE
++KDE_USE_PIE
++include_x11_TRUE
++include_x11_FALSE
++XMKMF
++X_PRE_LIBS
++LIB_X11
++LIB_XRENDER
++LIBSM
++X_INCLUDES
++X_LDFLAGS
++x_includes
++x_libraries
++QTE_NORTTI
++LIB_XEXT
++LIBPTHREAD
++USE_THREADS
++KDE_MT_LDFLAGS
++KDE_MT_LIBS
++USER_INCLUDES
++USER_LDFLAGS
++LIBZ
++LIBPNG
++LIBJPEG
++qt_libraries
++qt_includes
++QT_INCLUDES
++QT_LDFLAGS
++PERL
++MOC
++UIC
++UIC_TR
++LIB_QT
++LIB_QPE
++kde_qtver
++KDE_EXTRA_RPATH
++KDE_RPATH
++X_RPATH
++kde_libraries
++kde_includes
++KDE_LDFLAGS
++KDE_INCLUDES
++all_includes
++all_libraries
++AUTODIRS
++include_ARTS_TRUE
++include_ARTS_FALSE
++MAKEKDEWIDGETS
++KCONFIG_COMPILER
++KCFG_DEPENDENCIES
++DCOPIDLNG
++DCOPIDL
++DCOPIDL2CPP
++DCOP_DEPENDENCIES
++MCOPIDL
++ARTSCCONFIG
++MEINPROC
++KDE_XSL_STYLESHEET
++XMLLINT
++kde_htmldir
++kde_appsdir
++kde_icondir
++kde_sounddir
++kde_datadir
++kde_locale
++kde_confdir
++kde_kcfgdir
++kde_mimedir
++kde_wallpaperdir
++kde_bindir
++xdg_appsdir
++xdg_menudir
++xdg_directorydir
++kde_templatesdir
++kde_servicesdir
++kde_servicetypesdir
++kde_moduledir
++kdeinitdir
++kde_styledir
++kde_widgetdir
++LIB_KDED
++LIB_KDECORE
++LIB_KDEUI
++LIB_KIO
++LIB_KJS
++LIB_SMB
++LIB_KAB
++LIB_KABC
++LIB_KHTML
++LIB_KSPELL
++LIB_KPARTS
++LIB_KDEPRINT
++LIB_KUTILS
++LIB_KDEPIM
++LIB_KIMPROXY
++LIB_KNEWSTUFF
++LIB_KDNSSD
++LIB_KUNITTEST
++LIB_KSYCOCA
++LIB_KFILE
++LIB_KFM
++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
++include_akode_mpeg_TRUE
++include_akode_mpeg_FALSE
++include_akode_mpc_TRUE
++include_akode_mpc_FALSE
++include_akode_xiph_TRUE
++include_akode_xiph_FALSE
++include_akode_ffmpeg_TRUE
++include_akode_ffmpeg_FALSE
++LIB_ARTS
++ARTS_CFLAGS
++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
++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=''
++      ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++CPPFLAGS
++CPP
++CXX
++CXXFLAGS
++CCC
++CXXCPP
++F77
++FFLAGS
++XMKMF
++CCAS
++CCASFLAGS'
++
  
  # Initialize some variables set by options.
-@@ -1033,6 +1033,8 @@
+ ac_init_help=
+@@ -492,34 +1178,48 @@
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+ 
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
++    eval $ac_prev=\$ac_option
+     ac_prev=
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case $ac_option in
++  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *)	ac_optarg=yes ;;
++  esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
++  case $ac_dashdash$ac_option in
++  --)
++    ac_dashdash=yes ;;
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+@@ -541,12 +1241,18 @@
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++  -datadir | --datadir | --datadi | --datad)
+     ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+-  | --da=*)
++  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+@@ -554,7 +1260,17 @@
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
++    eval enable_$ac_feature=no ;;
++
++  -docdir | --docdir | --docdi | --doc | --do)
++    ac_prev=docdir ;;
++  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++    docdir=$ac_optarg ;;
++
++  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++    ac_prev=dvidir ;;
++  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++    dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+@@ -563,11 +1279,7 @@
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval enable_$ac_feature=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -594,6 +1306,12 @@
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$ac_optarg ;;
+ 
++  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++    ac_prev=htmldir ;;
++  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++  | --ht=*)
++    htmldir=$ac_optarg ;;
++
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+@@ -618,13 +1336,16 @@
+   | --libexe=* | --libex=* | --libe=*)
+     libexecdir=$ac_optarg ;;
+ 
++  -localedir | --localedir | --localedi | --localed | --locale)
++    ac_prev=localedir ;;
++  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++    localedir=$ac_optarg ;;
++
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst \
+-  | --locals | --local | --loca | --loc | --lo)
++  | --localstate | --localstat | --localsta | --localst | --locals)
+     ac_prev=localstatedir ;;
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+     localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -689,6 +1410,16 @@
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+     program_transform_name=$ac_optarg ;;
+ 
++  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++    ac_prev=pdfdir ;;
++  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++    pdfdir=$ac_optarg ;;
++
++  -psdir | --psdir | --psdi | --psd | --ps)
++    ac_prev=psdir ;;
++  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++    psdir=$ac_optarg ;;
++
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+@@ -745,11 +1476,7 @@
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
++    eval with_$ac_package=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+@@ -758,7 +1485,7 @@
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
++    eval with_$ac_package=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -789,8 +1516,7 @@
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
++    eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+@@ -810,27 +1536,19 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
+-  esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
++# Be sure to have absolute directory names.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
+-  eval ac_val=$`echo $ac_var`
++  eval ac_val=\$$ac_var
+   case $ac_val in
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++    [\\/$]* | ?:[\\/]* )  continue;;
++    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
++  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; }
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -857,102 +1575,76 @@
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++  { echo "$as_me: error: Working directory cannot be determined" >&2
++   { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++  { echo "$as_me: error: pwd does not report name of working directory" >&2
++   { (exit 1); exit 1; }; }
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
++  # Try the directory containing this script, then the parent directory.
++  ac_confdir=`$as_dirname -- "$0" ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$0" : 'X\(//\)[^/]' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   srcdir=$ac_confdir
+-  if test ! -r $srcdir/$ac_unique_file; then
++  if test ! -r "$srcdir/$ac_unique_file"; then
+     srcdir=..
+   fi
+ else
+   ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+-  if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+-   { (exit 1); exit 1; }; }
+-  else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+-   { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+-ac_env_CXX_set=${CXX+set}
+-ac_env_CXX_value=$CXX
+-ac_cv_env_CXX_set=${CXX+set}
+-ac_cv_env_CXX_value=$CXX
+-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_env_CXXFLAGS_value=$CXXFLAGS
+-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+-ac_env_CXXCPP_set=${CXXCPP+set}
+-ac_env_CXXCPP_value=$CXXCPP
+-ac_cv_env_CXXCPP_set=${CXXCPP+set}
+-ac_cv_env_CXXCPP_value=$CXXCPP
+-ac_env_F77_set=${F77+set}
+-ac_env_F77_value=$F77
+-ac_cv_env_F77_set=${F77+set}
+-ac_cv_env_F77_value=$F77
+-ac_env_FFLAGS_set=${FFLAGS+set}
+-ac_env_FFLAGS_value=$FFLAGS
+-ac_cv_env_FFLAGS_set=${FFLAGS+set}
+-ac_cv_env_FFLAGS_value=$FFLAGS
+-ac_env_CCAS_set=${CCAS+set}
+-ac_env_CCAS_value=$CCAS
+-ac_cv_env_CCAS_set=${CCAS+set}
+-ac_cv_env_CCAS_value=$CCAS
+-ac_env_CCASFLAGS_set=${CCASFLAGS+set}
+-ac_env_CCASFLAGS_value=$CCASFLAGS
+-ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set}
+-ac_cv_env_CCASFLAGS_value=$CCASFLAGS
++if test ! -r "$srcdir/$ac_unique_file"; then
++  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++fi
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++   { (exit 1); exit 1; }; }
++	pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++  srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++  eval ac_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_env_${ac_var}_value=\$${ac_var}
++  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+ 
+ #
+ # Report the --help message.
+@@ -981,9 +1673,6 @@
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+-_ACEOF
+-
+-  cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+ 			  [$ac_default_prefix]
+@@ -1001,15 +1690,22 @@
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
++  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR          info documentation [DATAROOTDIR/info]
++  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR           man documentation [DATAROOTDIR/man]
++  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
++  --htmldir=DIR          html documentation [DOCDIR]
++  --dvidir=DIR           dvi documentation [DOCDIR]
++  --pdfdir=DIR           pdf documentation [DOCDIR]
++  --psdir=DIR            ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -1033,6 +1729,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -5006,32 +7506,976 @@
    --disable-fast-perl     disable fast Makefile generation (needs perl)
    --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
    --disable-debug         disables debug output and debug symbols default=no
-@@ -1211,7 +1213,7 @@
+@@ -1050,10 +1748,8 @@
+                           of memory)
+   --enable-closure        delay template instantiation
+   --enable-nmcheck        enable automatic namespace cleanness check
+-  --enable-shared[=PKGS]
+-                          build shared libraries [default=yes]
+-  --enable-static[=PKGS]
+-                          build static libraries [default=no]
++  --enable-shared[=PKGS]  build shared libraries [default=yes]
++  --enable-static[=PKGS]  build static libraries [default=no]
+   --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
+   --enable-fast-install[=PKGS]
+                           optimize for fast installation [default=yes]
+@@ -1075,8 +1771,7 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-pic              try to use only PIC/non-PIC objects [default=use
+                           both]
+-  --with-tags[=TAGS]
+-                          include additional configurations [automatic]
++  --with-tags[=TAGS]      include additional configurations [automatic]
+   --with-extra-includes=DIR
+                           adds non standard include paths
+   --with-extra-libs=DIR   adds non standard library paths
+@@ -1085,8 +1780,7 @@
+   --with-qt-libraries=DIR where the Qt library is installed.
+   --without-arts          build without aRts default=no
+   --with-vorbis           enable support for Ogg Vorbis [default=check]
+-  --with-ossaudio         enable support for OpenBSD ossaudio
+-                          [default=check]
++  --with-ossaudio         enable support for OpenBSD ossaudio [default=check]
+   --with-alsa             enable support for ALSA [default=check]
+   --with-cdparanoia       enable support for CD ripping thorugh cdparanoia
+                           [default=check]
+@@ -1109,14 +1803,15 @@
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+-              headers in a nonstandard directory <include dir>
++  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++              you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   CXX         C++ compiler command
+   CXXFLAGS    C++ compiler flags
+   CXXCPP      C++ preprocessor
+   F77         Fortran 77 compiler command
+   FFLAGS      Fortran 77 compiler flags
++  XMKMF       Path to xmkmf, Makefile generator for X Window System
+   CCAS        assembler compiler command (defaults to CC)
+   CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
+ 
+@@ -1124,118 +1819,86 @@
+ it to find libraries and programs with nonstandard names/locations.
+ 
+ _ACEOF
++ac_status=$?
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
++    test -d "$ac_dir" || continue
+     ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+-
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-	   test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++    cd "$ac_dir" || { ac_status=$?; continue; }
++    # Check for guested configure.
++    if test -f "$ac_srcdir/configure.gnu"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++    elif test -f "$ac_srcdir/configure"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure" --help=recursive
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
+-    fi
 -    cd $ac_popdir
-+    cd "$ac_popdir"
++    fi || ac_status=$?
++    cd "$ac_pwd" || { ac_status=$?; break; }
    done
  fi
  
-@@ -2114,6 +2116,31 @@
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.59d
  
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+-  exit 0
++  exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
  
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.59d.  Invocation command line was
  
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+   $ $0 $@
+ 
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1254,7 +1917,7 @@
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+@@ -1268,6 +1931,7 @@
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+ 
+ } >&5
+ 
+@@ -1300,7 +1964,7 @@
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++    *\'*)
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+@@ -1335,8 +1999,8 @@
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+@@ -1349,20 +2013,34 @@
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
+   (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       sed -n \
+-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
++	"s/'\''/'\''\\\\'\'''\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++      ;; #(
+     *)
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-}
++    esac |
++    sort
++)
+     echo
+ 
+     cat <<\_ASBOX
+@@ -1373,22 +2051,22 @@
+     echo
+     for ac_var in $ac_subst_vars
+     do
+-      eval ac_val=$`echo $ac_var`
+-      echo "$ac_var='"'"'$ac_val'"'"'"
++      eval ac_val=\$$ac_var
++      echo "$ac_var='\''$ac_val'\''"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+-	eval ac_val=$`echo $ac_var`
+-	echo "$ac_var='"'"'$ac_val'"'"'"
++	eval ac_val=\$$ac_var
++	echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1400,26 +2078,24 @@
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h | sort
++      cat confdefs.h
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -f core *.core &&
+-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++  rm -f core *.core core.conftest.* &&
++    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+-     ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
+ 
+ # Predefined preprocessor variables.
+ 
+@@ -1450,14 +2126,17 @@
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+-  if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
++if test -n "$CONFIG_SITE"; then
++  set x "$CONFIG_SITE"
++elif test "x$prefix" != xNONE; then
++  set x "$prefix/share/config.site" "$prefix/etc/config.site"
++else
++  set x "$ac_default_prefix/share/config.site" \
++	"$ac_default_prefix/etc/config.site"
+ fi
+-for ac_site_file in $CONFIG_SITE; do
++shift
++for ac_site_file
++do
+   if test -r "$ac_site_file"; then
+     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+@@ -1473,8 +2152,8 @@
+     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
++      [\\/]* | ?:[\\/]* ) . "$cache_file";;
++      *)                      . "./$cache_file";;
+     esac
+   fi
+ else
+@@ -1486,12 +2165,11 @@
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+-  eval ac_new_val="\$ac_env_${ac_var}_value"
++  eval ac_old_val=\$ac_cv_env_${ac_var}_value
++  eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+@@ -1516,8 +2194,7 @@
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+@@ -1534,12 +2211,6 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+ 
+ 
+ 
+@@ -1556,110 +2227,165 @@
+ 
+ 
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ ac_aux_dir=
+-for ac_dir in admin $srcdir/admin; do
+-  if test -f $ac_dir/install-sh; then
++for ac_dir in admin "$srcdir"/admin; do
++  if test -f "$ac_dir/install-sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
+-  elif test -f $ac_dir/install.sh; then
++  elif test -f "$ac_dir/install.sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+-  elif test -f $ac_dir/shtool; then
++  elif test -f "$ac_dir/shtool"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
++
+ 
+ 
+ unset CDPATH
+ 
+ # Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+-echo "$as_me:$LINENO: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+-  ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
++  ac_build_alias=$build_alias
++test "x$ac_build_alias" = x &&
++  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
++test "x$ac_build_alias" = x &&
+   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6; }
++case $ac_cv_build in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
++echo "$as_me: error: invalid value of canonical build" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_build
++shift
++build_cpu=$1
++build_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++build_os=$*
++IFS=$ac_save_IFS
++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-echo "$as_me:$LINENO: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+-  ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++  if test "x$host_alias" = x; then
++  ac_cv_host=$ac_cv_build
++else
++  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
++fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6; }
++case $ac_cv_host in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
++echo "$as_me: error: invalid value of canonical host" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_host
++shift
++host_cpu=$1
++host_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++host_os=$*
++IFS=$ac_save_IFS
++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-echo "$as_me:$LINENO: checking target system type" >&5
+-echo $ECHO_N "checking target system type... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking target system type" >&5
++echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+ if test "${ac_cv_target+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_target_alias=$target_alias
+-test "x$ac_cv_target_alias" = "x" &&
+-  ac_cv_target_alias=$ac_cv_host_alias
+-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
+-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
++  if test "x$target_alias" = x; then
++  ac_cv_target=$ac_cv_host
++else
++  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
++fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+-echo "${ECHO_T}$ac_cv_target" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
++echo "${ECHO_T}$ac_cv_target" >&6; }
++case $ac_cv_target in
++*-*-*) ;;
++*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
++echo "$as_me: error: invalid value of canonical target" >&2;}
++   { (exit 1); exit 1; }; };;
++esac
+ target=$ac_cv_target
+-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++ac_save_IFS=$IFS; IFS='-'
++set x $ac_cv_target
++shift
++target_cpu=$1
++target_vendor=$2
++shift; shift
++# Remember, the first character of IFS is used to create $*,
++# except with old shells:
++target_os=$*
++IFS=$ac_save_IFS
++case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+ # The aliases save the names the user supplied, while $host etc.
+@@ -1669,17 +2395,17 @@
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ test "$program_prefix" != NONE &&
+-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
++  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
++  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+ # Double any \ or $.  echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++rm -f conftest.sed
+ 
+ 
+ am__api_version="1.9"
+@@ -1701,8 +2427,8 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1724,7 +2450,7 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -1743,21 +2469,22 @@
+     ;;
+ esac
+ done
++IFS=$as_save_IFS
+ 
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+     INSTALL=$ac_cv_path_install
+   else
+-    # As a last resort, use the slow shell script.  We don't cache a
+-    # path for INSTALL within a source directory, because that will
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for INSTALL within a source directory, because that will
+     # break other packages using the cache if that directory is
+-    # removed, or if the path is relative.
++    # removed, or if the value is a relative name.
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1771,8 +2498,8 @@
+   if test -z "$kde_save_INSTALL_given" ; then
+     # OK, user hasn't given any INSTALL, autoconf found one for us
+     # now we test, if it supports the -p flag
+-    echo "$as_me:$LINENO: checking for -p flag to install" >&5
+-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
++echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
+     rm -f confinst.$$.* > /dev/null 2>&1
+     echo "Testtest" > confinst.$$.orig
+     ac_res=no
+@@ -1784,8 +2511,8 @@
+       fi
+     fi
+     rm -f confinst.$$.*
+-    echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
++    { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+   fi
+ 
+   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
+@@ -1795,8 +2522,8 @@
+     INSTALL_SCRIPT='${INSTALL}'
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1838,8 +2565,8 @@
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+@@ -1890,8 +2617,8 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -1904,41 +2631,44 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++  { echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$AWK" && break
+ done
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+-	@echo 'ac_maketemp="$(MAKE)"'
++	@echo 'ac_maketemp=X"$(MAKE)"'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
++if test "$ac_maketemp" != X ; then
+   eval ac_cv_prog_make_${ac_make}_set=yes
+ else
+   eval ac_cv_prog_make_${ac_make}_set=no
+@@ -1946,12 +2676,12 @@
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   SET_MAKE=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -2022,8 +2752,8 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2036,32 +2766,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++  { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2074,27 +2806,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -2114,6 +2860,31 @@
+ 
+ 
+ 
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++    # Check whether --enable-maintainer-mode was given.
 +if test "${enable_maintainer_mode+set}" = set; then
-+  enableval="$enable_maintainer_mode"
-+  USE_MAINTAINER_MODE=$enableval
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 +else
 +  USE_MAINTAINER_MODE=no
-+fi;
-+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
 +
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 +
++
 +if test $USE_MAINTAINER_MODE = yes; then
 +  MAINTAINER_MODE_TRUE=
 +  MAINTAINER_MODE_FALSE='#'
@@ -5047,347 +8491,3039 @@
  
    unset CDPATH
  
-@@ -3047,8 +3074,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
+@@ -2132,14 +2903,14 @@
+ 
+   if test "x$prefix" = "xNONE"; then
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2182,8 +2953,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2194,8 +2965,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2204,14 +2975,14 @@
+         kde_save_PATH="$PATH"
+     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
+ 
+-   echo "$as_me:$LINENO: checking for kde-config" >&5
+-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kde-config" >&5
++echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+    if test -n "$KDECONFIG"; then
+         kde_cv_path="$KDECONFIG";
+    else
+         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -2254,8 +3025,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+ Please check whether you installed KDE correctly.
+@@ -2266,8 +3037,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KDECONFIG=$kde_cv_path
+ 
+    fi
+@@ -2290,16 +3061,16 @@
+   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
+   kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
+ 
+-  echo "$as_me:$LINENO: checking where to install" >&5
+-echo $ECHO_N "checking where to install... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking where to install" >&5
++echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
+   if test "x$prefix" = "xNONE"; then
+     prefix=$kde_libs_prefix
+-    echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
+-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
++    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
++echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
+   else
+         given_prefix=$prefix
+-    echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
+-echo "${ECHO_T}$prefix (as requested)" >&6
++    { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
++echo "${ECHO_T}$prefix (as requested)" >&6; }
+   fi
+ 
+   # And delete superfluous '/' to make compares easier
+@@ -2312,13 +3083,13 @@
+ 
+ 
+ 
+-    # Check whether --enable-fast-perl or --disable-fast-perl was given.
++    # Check whether --enable-fast-perl was given.
+ if test "${enable_fast_perl+set}" = set; then
+-  enableval="$enable_fast_perl"
+-  with_fast_perl=$enableval
++  enableval=$enable_fast_perl; with_fast_perl=$enableval
+ else
+   with_fast_perl=yes
+-fi;
++fi
++
+ 
+ 
+   val=
+@@ -2335,11 +3106,11 @@
+ 
+ 
+ 
+-          ac_config_headers="$ac_config_headers config.h"
++ac_config_headers="$ac_config_headers config.h"
+ 
+ DEPDIR="${am__leading_dot}deps"
+ 
+-          ac_config_commands="$ac_config_commands depfiles"
++ac_config_commands="$ac_config_commands depfiles"
+ 
+ 
+ am_make=${MAKE-make}
+@@ -2349,8 +3120,8 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2377,15 +3148,15 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
+ rm -f confinc confmf
+ 
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++# Check whether --enable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+-  enableval="$enable_dependency_tracking"
++  enableval=$enable_dependency_tracking;
++fi
+ 
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+@@ -2405,10 +3176,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-debug or --disable-debug was given.
++  # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then
+-  enableval="$enable_debug"
+-
++  enableval=$enable_debug;
+     case $enableval in
+       yes)
+         kde_use_debug_code="yes"
+@@ -2428,18 +3198,18 @@
+   kde_use_debug_code="no"
+       kde_use_debug_define=no
+ 
+-fi;
++fi
+ 
+-    # Check whether --enable-dummyoption or --disable-dummyoption was given.
++
++    # Check whether --enable-dummyoption was given.
+ if test "${enable_dummyoption+set}" = set; then
+-  enableval="$enable_dummyoption"
++  enableval=$enable_dummyoption;
++fi
+ 
+-fi;
+ 
+-  # Check whether --enable-strict or --disable-strict was given.
++  # Check whether --enable-strict was given.
+ if test "${enable_strict+set}" = set; then
+-  enableval="$enable_strict"
+-
++  enableval=$enable_strict;
+     if test $enableval = "no"; then
+          kde_use_strict_options="no"
+        else
+@@ -2448,12 +3218,12 @@
+ 
+ else
+   kde_use_strict_options="no"
+-fi;
++fi
+ 
+-  # Check whether --enable-warnings or --disable-warnings was given.
+-if test "${enable_warnings+set}" = set; then
+-  enableval="$enable_warnings"
+ 
++  # Check whether --enable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++  enableval=$enable_warnings;
+     if test $enableval = "no"; then
+          kde_use_warnings="no"
+        else
+@@ -2462,20 +3232,21 @@
+ 
+ else
+   kde_use_warnings="yes"
+-fi;
++fi
++
+ 
+     if test "$kde_use_debug_code" != "no"; then
+     kde_use_warnings=yes
+   fi
+ 
+-  # Check whether --enable-profile or --disable-profile was given.
++  # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then
+-  enableval="$enable_profile"
+-  kde_use_profiling=$enableval
++  enableval=$enable_profile; kde_use_profiling=$enableval
+ else
+   kde_use_profiling="no"
+ 
+-fi;
++fi
++
+ 
+     CFLAGS=" $CFLAGS"
+ 
+@@ -2487,8 +3258,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2501,32 +3272,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2539,36 +3312,51 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ else
+   CC="$ac_cv_prog_CC"
+ fi
+ 
+ if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2581,74 +3369,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+ 
++  fi
+ fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2662,7 +3410,7 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+@@ -2673,6 +3421,7 @@
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+   # We found a bogon in the path, so make sure we never use it.
+@@ -2690,22 +3439,23 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$CC"; then
+   if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2718,36 +3468,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+     test -n "$CC" && break
+   done
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -2760,29 +3512,45 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CC" && break
+ done
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ fi
+ 
+ fi
+@@ -2795,25 +3563,38 @@
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
++echo "$as_me:$LINENO: checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
-@@ -3106,8 +3132,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
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -3223,8 +3248,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
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -3278,8 +3302,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
+   (exit $ac_status); }
+ 
++
++# List of possible output files.  We want to start from the most likely,
++# but we have to check foo.exe before foo, because Cygwin `test -f' looks
++# also for foo.exe.  b.out is created by i960 compilers.
++# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
++# But we are not allowed to rm a.*, and we do not want always remove
++# conftest.*, so we will list them literally, when appropriate.
++ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out"
++
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions.  Remove them first so a
++# subsequent execution test works.
++rm -f $ac_outfiles conftest.*
++
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -2829,51 +3610,40 @@
+   return 0;
+ }
+ _ACEOF
++
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files $ac_outfiles"
++
++# The following tests should remove their output except files matching conftest.*.
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
+ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
    ac_status=$?
-@@ -3324,8 +3347,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
+   (exit $ac_status); }; then
+-  # Find the output, starting from the most likely.  This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++  for ac_file in $ac_outfiles a.* conftest.* NO
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+-	;;
+-    conftest.$ac_ext )
+-	# This is the source file.
+-	;;
+-    [ab].out )
+-	# We found the default executable, but exeext='' is most
+-	# certainly right.
+-	break;;
+-    *.* )
+-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	# FIXME: I believe we export ac_cv_exeext for Libtool,
+-	# but it would be cool to find out if it's true.  Does anybody
+-	# maintain Libtool? --akim.
+-	export ac_cv_exeext
+-	break;;
+-    * )
+-	break;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    * ) break;;
+   esac
+ done
++if test "$ac_file" = NO; then
++  { { echo "$as_me:$LINENO: error: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: no output file found
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2885,14 +3655,12 @@
+    { (exit 77); exit 77; }; }
+ fi
+ 
+-ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+-
+-# Check the compiler produces executables we can run.  If not, either
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++# Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+@@ -2917,83 +3685,84 @@
+     fi
+   fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
++# Clean up; list also $ac_file, in case it matched a wildcard entry.
++rm -f $ac_outfiles $ac_file
+ 
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++if test "${ac_cv_exeext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
    ac_status=$?
-@@ -3369,8 +3391,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
+   (exit $ac_status); }; then
+-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  export ac_cv_exeext
+-	  break;;
+-    * ) break;;
+-  esac
+-done
++  # If both `conftest.exe' and `conftest' are `present' (well, observable),
++    # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++    # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
++    for ac_file in conftest.exe conftest conftest.* NO; do
++      test -f "$ac_file" || continue
++      case $ac_file in
++	*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++	*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	      break;;
++	* ) break;;
++      esac
++    done
++    if test "$ac_file" = NO; then
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++    # Clean up; list also $ac_file, in case it matched conftest.*.
++    rm -f $ac_outfiles $ac_file
++
+ else
+   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
++
+ fi
+ 
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+-rm -f conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++
++
++ac_clean_files=$ac_clean_files_save
++
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
++  rm -f conftest.o conftest.obj
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -3927,8 +3948,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
+   (exit $ac_status); }; then
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  for ac_file in conftest.o conftest.obj conftest.*; do
++  test -f "$ac_file" || continue;
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+@@ -3009,14 +3778,16 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++
++
++rm -f conftest.*
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3065,24 +3836,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_save_c_werror_flag=$ac_c_werror_flag
++   ac_c_werror_flag=yes
++   ac_cv_prog_cc_g=no
++   CFLAGS="-g"
++   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -3124,97 +3899,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++	CFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
++
++int
++main ()
+ {
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+ 
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+-   function prototypes and stuff, but not '\xHH' hex character constants.
+-   These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std1 is added to get
+-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+-   array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std1.  */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+   ;
+   return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
++rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -3986,8 +4006,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
+@@ -3236,81 +3937,24 @@
    ac_status=$?
-@@ -4058,8 +4077,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=$?
-@@ -4103,8 +4121,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=$?
-@@ -4282,8 +4299,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
++  :
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { 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
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
++	ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+@@ -3337,30 +3981,104 @@
    ac_status=$?
-@@ -4394,8 +4410,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
+   (exit $ac_status); }; }; then
+-  :
++  ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-continue
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
+-exit (42);
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -4483,8 +4498,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
+@@ -3382,27 +4100,36 @@
    ac_status=$?
-@@ -4586,8 +4600,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
+   (exit $ac_status); }; }; then
+-  break
++  ac_cv_prog_cc_c89=$ac_arg
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++  xno)
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++  *)
++    CC="$CC $ac_cv_prog_cc_c89"
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
+ 
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3411,8 +4138,8 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3501,8 +4228,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+ 
+@@ -3524,8 +4251,8 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -3585,9 +4312,10 @@
+   # 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
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3625,6 +4353,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3642,8 +4371,8 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3692,9 +4421,10 @@
+   # 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
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3732,6 +4462,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3782,18 +4513,22 @@
+ 
+   CXXFLAGS=" $CXXFLAGS"
+ 
+-  ac_ext=cc
++  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++if test -z "$CXX"; then
++  if test -n "$CCC"; then
++    CXX=$CCC
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3806,36 +4541,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
++  { echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+     test -n "$CXX" && break
+   done
+ fi
+ if test -z "$CXX"; then
+   ac_ct_CXX=$CXX
+-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3848,55 +4585,70 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CXX" && break
+ done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+ 
+-  CXX=$ac_ct_CXX
++  if test "x$ac_ct_CXX" = x; then
++    CXX="g++"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    CXX=$ac_ct_CXX
++  fi
+ fi
+ 
+-
++  fi
++fi
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C++ compiler version" >&5
++echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
-@@ -4686,8 +4699,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
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -4771,8 +4783,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
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -4861,8 +4872,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
+   (exit $ac_status); }
+ 
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3945,24 +4697,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+ GXX=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cxx_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++   ac_cxx_werror_flag=yes
++   ac_cv_prog_cxx_g=no
++   CXXFLAGS="-g"
++   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4004,47 +4760,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+-  CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-g -O2"
+-  else
+-    CXXFLAGS="-g"
+-  fi
+-else
+-  if test "$GXX" = yes; then
+-    CXXFLAGS="-O2"
+-  else
+-    CXXFLAGS=
+-  fi
+-fi
+-for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
++	CXXFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+@@ -4076,20 +4803,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
++	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++	 CXXFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
++
+ int
+ main ()
+ {
+-exit (42);
++
+   ;
+   return 0;
+ }
+@@ -4116,21 +4842,40 @@
    ac_status=$?
-@@ -4949,8 +4959,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=$?
-@@ -5037,8 +5046,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=$?
-@@ -5145,8 +5153,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=$?
-@@ -5239,8 +5246,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=$?
-@@ -5327,8 +5333,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=$?
-@@ -5415,8 +5420,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=$?
-@@ -5503,8 +5507,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=$?
-@@ -5619,8 +5622,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=$?
-@@ -5712,8 +5714,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=$?
-@@ -5801,8 +5802,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=$?
-@@ -5889,8 +5889,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=$?
-@@ -5977,8 +5976,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=$?
-@@ -6065,8 +6063,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=$?
-@@ -6153,8 +6150,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=$?
-@@ -6577,8 +6573,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=$?
-@@ -6704,8 +6699,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6793,8 +6787,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=$?
-@@ -6877,185 +6870,6 @@
+   (exit $ac_status); }; }; then
+-  break
++  ac_cv_prog_cxx_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+ fi
+ 
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++  CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4139,8 +4884,8 @@
+ 
+ depcc="$CXX"  am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -4229,8 +4974,8 @@
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ 
+ 
+@@ -4248,8 +4993,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
+-echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
++echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
+ 
+ 
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -4300,13 +5045,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_bad_compiler=yes
++	kde_bad_compiler=yes
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-  echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
+-echo "${ECHO_T}$kde_bad_compiler" >&6
++  { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
++echo "${ECHO_T}$kde_bad_compiler" >&6; }
+ 
+ if test "$kde_bad_compiler" = "yes"; then
+   { { echo "$as_me:$LINENO: error:
+@@ -4348,17 +5094,16 @@
+         fi
+       fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
+ kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+ 
+-
+-ac_ext=cc
++ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4412,7 +5157,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4426,29 +5173,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-fno-builtin $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
+-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
++echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
+ kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4501,7 +5247,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4515,13 +5263,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  WOVERLOADED_VRITUAL=""
+ fi
+@@ -4542,16 +5290,15 @@
+ 
+   if test "$kde_use_profiling" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
+-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
++echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
+ kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4604,7 +5351,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4618,16 +5367,16 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       CFLAGS="-pg $CFLAGS"
+       CXXFLAGS="-pg $CXXFLAGS"
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4642,16 +5391,15 @@
+             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4704,7 +5452,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4718,27 +5468,26 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
+-echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
++echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
+ kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -4789,7 +5538,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CFLAGS="$save_CFLAGS"
+@@ -4803,13 +5554,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4817,16 +5568,15 @@
+           ;;
+         esac
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
++echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
+ kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4879,7 +5629,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4893,28 +5645,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wundef $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -4967,7 +5718,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4981,28 +5734,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
++echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
+ kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5055,7 +5807,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5069,13 +5823,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5087,13 +5841,13 @@
+     CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
+   fi
+ 
+-  # Check whether --enable-pch or --disable-pch was given.
++  # Check whether --enable-pch was given.
+ if test "${enable_pch+set}" = set; then
+-  enableval="$enable_pch"
+-   kde_use_pch=$enableval
++  enableval=$enable_pch;  kde_use_pch=$enableval
+ else
+    kde_use_pch=no
+-fi;
++fi
++
+ 
+   HAVE_GCC_VISIBILITY=0
+ 
+@@ -5101,16 +5855,15 @@
+   if test "$GXX" = "yes"; then
+     gcc_no_reorder_blocks=NO
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
+ kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5163,7 +5916,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5177,13 +5932,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  gcc_no_reorder_blocks=YES
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5195,16 +5950,15 @@
+           CFLAGS="$CFLAGS -fno-reorder-blocks"
+     fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5257,7 +6011,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5271,28 +6027,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
+ kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5345,7 +6100,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5359,28 +6116,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
+ kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5433,7 +6189,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5447,28 +6205,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
+ kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5521,7 +6278,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5535,13 +6294,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_EXCEPTIONS="-fexceptions"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+  USE_EXCEPTIONS=
+ fi
+@@ -5549,37 +6308,37 @@
+     ENABLE_PERMISSIVE_FLAG="-fpermissive"
+ 
+     if test "$kde_use_pch" = "yes"; then
+-        echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
+         echo >conftest.h
+         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
+             kde_gcc_supports_pch=yes
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         else
+             kde_gcc_supports_pch=no
+-            echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++            { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         fi
+         if test "$kde_gcc_supports_pch" = "yes"; then
+-            echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
+-echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
++echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
+             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
+                 kde_gcc_supports_pch=yes
+-                echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++                { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             else
+                 kde_gcc_supports_pch=no
+-                echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++                { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+             fi
+         fi
+         rm -f conftest.h conftest.h.gch
+     fi
+ 
+ 
+-  echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
+-echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
++echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
+ if test "${kde_cv_opt_noinline_match+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5637,9 +6396,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_opt_noinline_match=no
++	kde_cv_opt_noinline_match=no
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -5647,8 +6407,8 @@
+   fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
++echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+ 
+     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5668,16 +6428,15 @@
+ 
+     if test "$kde_use_pch" = "yes"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
+-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
++echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
+ kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5730,7 +6489,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5744,29 +6505,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --pch"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+                                               fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5819,7 +6579,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5833,28 +6595,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5907,7 +6668,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5921,28 +6684,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5995,7 +6757,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6009,28 +6773,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
+-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
++echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
+ kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6083,7 +6846,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6097,28 +6862,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
+-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
++echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
+ kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6171,7 +6935,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6185,13 +6951,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --one_per"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -6298,13 +7064,13 @@
+ fi
+ 
+ 
+-  ac_ext=cc
++  ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+ if test -z "$CXXCPP"; then
+   if test "${ac_cv_prog_CXXCPP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6360,9 +7126,10 @@
+   # 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
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6400,6 +7167,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6417,8 +7185,8 @@
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:$LINENO: result: $CXXCPP" >&5
+-echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+ do
+@@ -6467,9 +7235,10 @@
+   # 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
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6507,6 +7276,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6533,16 +7303,15 @@
+      NOOPT_CFLAGS=-O0
+   fi
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
+-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
++echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
+ kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6595,7 +7364,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6609,22 +7380,21 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  NOOPT_CXXFLAGS=-O0
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+-  # Check whether --enable-coverage or --disable-coverage was given.
++  # Check whether --enable-coverage was given.
+ if test "${enable_coverage+set}" = set; then
+-  enableval="$enable_coverage"
+-
++  enableval=$enable_coverage;
+       if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
+         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
+         ac_coverage_linker="-lgcc"
+@@ -6640,36 +7410,36 @@
+       CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
+       LDFLAGS="$LDFLAGS $ac_coverage_linker"
+ 
+-fi;
++fi
++
+ 
+ 
+ 
+ 
+ 
+ 
+-  # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
++  # Check whether --enable-new_ldflags was given.
+ if test "${enable_new_ldflags+set}" = set; then
+-  enableval="$enable_new_ldflags"
+-  kde_use_new_ldflags=$enableval
++  enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
+ else
+   kde_use_new_ldflags=no
+-fi;
++fi
++
+ 
+   LDFLAGS_AS_NEEDED=""
+   LDFLAGS_NEW_DTAGS=""
+   if test "x$kde_use_new_ldflags" = "xyes"; then
+        LDFLAGS_NEW_DTAGS=""
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6722,7 +7492,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6736,29 +7508,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
++echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
+ kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6811,7 +7582,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6825,13 +7598,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -6841,13 +7614,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-final or --disable-final was given.
++  # Check whether --enable-final was given.
+ if test "${enable_final+set}" = set; then
+-  enableval="$enable_final"
+-  kde_use_final=$enableval
++  enableval=$enable_final; kde_use_final=$enableval
+ else
+   kde_use_final=no
+-fi;
++fi
++
+ 
+   if test "x$kde_use_final" = "xyes"; then
+       KDE_USE_FINAL_TRUE=""
+@@ -6860,13 +7633,13 @@
+ 
+ 
+ 
+-  # Check whether --enable-closure or --disable-closure was given.
++  # Check whether --enable-closure was given.
+ if test "${enable_closure+set}" = set; then
+-  enableval="$enable_closure"
+-  kde_use_closure=$enableval
++  enableval=$enable_closure; kde_use_closure=$enableval
+ else
+   kde_use_closure=no
+-fi;
++fi
++
+ 
+   KDE_NO_UNDEFINED=""
+   if test "x$kde_use_closure" = "xyes"; then
+@@ -6877,198 +7650,19 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -5573,7 +11709,125 @@
    fi
  
  
-@@ -7230,7 +7044,7 @@
+ 
+ 
+ 
+-  # Check whether --enable-nmcheck or --disable-nmcheck was given.
++  # Check whether --enable-nmcheck was given.
+ if test "${enable_nmcheck+set}" = set; then
+-  enableval="$enable_nmcheck"
+-  kde_use_nmcheck=$enableval
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
+   kde_use_nmcheck=no
+-fi;
++fi
++
+ 
+   if test "$kde_use_nmcheck" = "yes"; then
+       KDE_USE_NMCHECK_TRUE=""
+@@ -7083,10 +7677,9 @@
+ 
+ 
+ 
+-# Check whether --enable-shared or --disable-shared was given.
++# Check whether --enable-shared was given.
+ if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
++  enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+     no) enable_shared=no ;;
+@@ -7105,12 +7698,12 @@
+     esac
+ else
+   enable_shared=yes
+-fi;
++fi
+ 
+-# Check whether --enable-static or --disable-static was given.
++
++# Check whether --enable-static was given.
+ if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
++  enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+     no) enable_static=no ;;
+@@ -7129,7 +7722,8 @@
+     esac
+ else
+   enable_static=no
+-fi;
++fi
++
+ 
+ 
+ 
+@@ -7138,11 +7732,11 @@
+     if test -z "$kdelibsuff"; then
+        kdelibsuff="no"
+     fi
+-    # Check whether --enable-libsuffix or --disable-libsuffix was given.
++    # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
+-  enableval="$enable_libsuffix"
+-  kdelibsuff=$enableval
+-fi;
++  enableval=$enable_libsuffix; kdelibsuff=$enableval
++fi
++
+ 
+     if test "$kdelibsuff" = "auto"; then
+ 
+@@ -7163,8 +7757,8 @@
+        kdelibsuff=
+     fi
+     if test -z "$kdelibsuff"; then
+-        echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
+-echo "${ECHO_T}not using lib directory suffix" >&6
++        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
++echo "${ECHO_T}not using lib directory suffix" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define KDELIBSUFF ""
+@@ -7180,14 +7774,13 @@
+ #define KDELIBSUFF "${kdelibsuff}"
+ _ACEOF
+ 
+-        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
+-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
++        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
++echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+     fi
+ 
+-# Check whether --enable-fast-install or --disable-fast-install was given.
++# Check whether --enable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
++  enableval=$enable_fast_install; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+     no) enable_fast_install=no ;;
+@@ -7206,10 +7799,11 @@
+     esac
+ else
+   enable_fast_install=yes
+-fi;
++fi
++
+ 
+-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+ if test "${lt_cv_path_SED+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7233,7 +7827,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
@@ -5582,7 +11836,228 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7335,7 +7149,7 @@
+@@ -7262,37 +7856,184 @@
+ fi
+ 
+ SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
++  # Extract the first word of "grep ggrep" to use in msg output
++if test -z "$GREP"; then
++set dummy grep ggrep; ac_prog_name=$2
++if test "${ac_cv_path_GREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_path_GREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in grep ggrep; do
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    # Check for GNU ac_path_GREP and select it if it is found.
++  # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++  ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    echo 'GREP' >> "conftest.nl"
++    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_GREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_GREP="$ac_path_GREP"
++      ac_path_GREP_max=$ac_count
+     fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++    $ac_path_GREP_found && break 3
++  done
++done
++
++done
++IFS=$as_save_IFS
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
++GREP="$ac_cv_path_GREP"
++if test -z "$GREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ 
++else
++  ac_cv_path_GREP=$GREP
++fi
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
++
++{ echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  with_gnu_ld=no
+-fi;
+-ac_prog=ld
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     # Extract the first word of "egrep" to use in msg output
++if test -z "$EGREP"; then
++set dummy egrep; ac_prog_name=$2
++if test "${ac_cv_path_EGREP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_path_EGREP_found=false
++# Loop through the user's path and test for each of PROGNAME-LIST
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in egrep; do
++  for ac_exec_ext in '' $ac_executable_extensions; do
++    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    # Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++  ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++
++    $ac_path_EGREP_found && break 3
++  done
++done
++
++done
++IFS=$as_save_IFS
++
++
++fi
++
++EGREP="$ac_cv_path_EGREP"
++if test -z "$EGREP"; then
++  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++else
++  ac_cv_path_EGREP=$EGREP
++fi
++
++
++   fi
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
++
++
++
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi
++
++ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -7321,11 +8062,11 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7338,7 +8079,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,
@@ -5591,7 +12066,27 @@
        # 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'*)
-@@ -7369,7 +7183,7 @@
+@@ -7358,21 +8099,21 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++  { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -5600,7 +12095,33 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7399,6 +7213,15 @@
+@@ -7382,29 +8123,38 @@
+   ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+ if test "${lt_cv_ld_reload_flag+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -5614,9 +12135,14 @@
 +    ;;
 +esac
  
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7409,36 +7232,43 @@
+-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+ if test "${lt_cv_path_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7412,56 +8162,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -5684,7 +12210,37 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
-@@ -7485,44 +7315,36 @@
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+ NM="$lt_cv_path_NM"
+ 
+-echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
++  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+ 
+-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7488,44 +8245,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -5739,7 +12295,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7538,7 +7360,7 @@
+@@ -7541,7 +8290,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -5748,7 +12304,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7554,43 +7376,27 @@
+@@ -7557,43 +8306,27 @@
    esac
    ;;
  
@@ -5805,7 +12361,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7609,32 +7415,22 @@
+@@ -7612,32 +8345,22 @@
    ;;
  
  openbsd*)
@@ -5841,7 +12397,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7655,10 +7451,13 @@
+@@ -7658,17 +8381,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -5856,7 +12412,16 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -7674,6 +7473,9 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -7677,14 +8403,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -5866,16 +12431,27 @@
  # Allow CC to be a program name with arguments.
  compiler=$CC
  
-@@ -7708,7 +7510,7 @@
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++  enableval=$enable_libtool_lock;
++fi
+ 
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ # Some flags need to be propagated to the compiler or linker for good
+@@ -7711,7 +8440,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7711 "configure"' > conftest.$ac_ext
-+  echo '#line 7513 "configure"' > conftest.$ac_ext
+-  echo '#line 7714 "configure"' > conftest.$ac_ext
++  echo '#line 8443 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7751,14 +7553,13 @@
+@@ -7754,14 +8483,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -5892,7 +12468,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7770,7 +7571,6 @@
+@@ -7773,7 +8501,6 @@
        esac
        ;;
      *64-bit*)
@@ -5900,17 +12476,38 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7830,8 +7630,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=$?
-@@ -7866,6 +7665,26 @@
+@@ -7798,8 +8525,8 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7851,8 +8578,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-lt_cv_cc_needs_belf=no
++	lt_cv_cc_needs_belf=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+@@ -7862,13 +8590,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -5937,38 +12534,194 @@
  
  esac
  
-@@ -7906,8 +7725,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=$?
-@@ -8077,8 +7895,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=$?
-@@ -8145,8 +7962,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=$?
-@@ -8261,6 +8077,243 @@
+@@ -7876,8 +8624,8 @@
  
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7927,8 +8675,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
++	ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+@@ -7985,6 +8734,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -8004,8 +8754,8 @@
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -8028,12 +8778,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -8056,9 +8808,9 @@
+ 		  inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -8098,12 +8850,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Header=no"
++	eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -8118,18 +8872,19 @@
+ for ac_header in dlfcn.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8166,15 +8921,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8208,9 +8964,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -8234,25 +8991,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -8264,17 +9015,258 @@
+ 
  done
  
 +
@@ -5976,13 +12729,13 @@
 +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_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6038,9 +12791,10 @@
 +  # 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
++  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -6078,6 +12832,7 @@
 +ac_preproc_ok=:
 +break
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -6095,8 +12850,8 @@
 +else
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
-+echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6
++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6; }
 +ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
@@ -6145,9 +12900,10 @@
 +  # 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
++  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -6185,6 +12941,7 @@
 +ac_preproc_ok=:
 +break
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -6200,7 +12957,7 @@
 +   { (exit 1); exit 1; }; }
 +fi
 +
-+ac_ext=cc
++ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -6211,45 +12968,219 @@
  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'
-@@ -8353,7 +8406,7 @@
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8287,36 +9279,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
  
+ fi
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+-  echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
++  { echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
  
++
+     test -n "$F77" && break
+   done
+ fi
+ if test -z "$F77"; then
+   ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8329,48 +9323,63 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_F77="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_F77" && break
+ done
+ 
+-  F77=$ac_ct_F77
++  if test "x$ac_ct_F77" = x; then
++    F77=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    F77=$ac_ct_F77
++  fi
+ fi
+ 
+ 
  # Provide some information about the compiler.
--echo "$as_me:8356:" \
-+echo "$as_me:8409:" \
-      "checking for Fortran 77 compiler version" >&5
+-echo "$as_me:8359:" \
+-     "checking for Fortran 77 compiler version" >&5
++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8399,8 +8452,7 @@
-   cat conftest.err >&5
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
+   ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -8449,8 +8501,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -8508,7 +8559,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+@@ -8380,8 +9389,8 @@
+ # input file.  (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
+@@ -8420,20 +9429,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8470,13 +9480,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_f77_g=no
++	ac_cv_prog_f77_g=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+ if test "$ac_test_FFLAGS" = set; then
+   FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8505,13 +9516,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ 
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
      i=0
 -  testring="ABCD"
 +  teststring="ABCD"
  
    case $build_os in
    msdosdjgpp*)
-@@ -8537,20 +8588,70 @@
+@@ -8540,20 +9551,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -6326,7 +13257,33 @@
      # 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.
-@@ -8587,9 +8688,6 @@
+@@ -8564,19 +9625,19 @@
+ fi
+ 
+ if test -n $lt_cv_sys_max_cmd_len ; then
+-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
++  { echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6; }
+ fi
+ 
+ 
+ 
+ 
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8590,9 +9651,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -6336,7 +13293,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -8611,14 +8709,30 @@
+@@ -8614,14 +9672,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -6369,7 +13326,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8636,14 +8750,17 @@
+@@ -8639,14 +9713,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -6389,8 +13346,41 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8805,7 +8922,7 @@
+@@ -8764,15 +9841,15 @@
+   lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+-  echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++  { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
++  { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
+ fi
  
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+ if test "${lt_cv_objdir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8786,8 +9863,8 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+-echo "${ECHO_T}$lt_cv_objdir" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+ 
+ 
+@@ -8808,7 +9885,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//'
@@ -6398,7 +13388,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8825,7 +8942,7 @@
+@@ -8828,7 +9905,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -6407,7 +13397,313 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9082,6 +9199,7 @@
+@@ -8838,8 +9915,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8852,32 +9929,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  echo "$as_me:$LINENO: result: $AR" >&5
+-echo "${ECHO_T}$AR" >&6
++  { echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_AR"; then
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8890,27 +9969,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="ar"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-echo "${ECHO_T}$ac_ct_AR" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  AR=$ac_ct_AR
++  if test "x$ac_ct_AR" = x; then
++    AR="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    AR=$ac_ct_AR
++  fi
+ else
+   AR="$ac_cv_prog_AR"
+ fi
+@@ -8918,8 +10011,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8932,32 +10025,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++  { echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8970,27 +10065,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  RANLIB=$ac_ct_RANLIB
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    RANLIB=$ac_ct_RANLIB
++  fi
+ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -8998,8 +10107,8 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9012,32 +10121,34 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++  { echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9050,27 +10161,41 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+@@ -9085,6 +10210,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -6415,7 +13711,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9101,15 +9219,26 @@
+@@ -9104,21 +10230,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -6444,7 +13740,15 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -9135,7 +9264,7 @@
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9138,7 +10275,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -6453,7 +13757,31 @@
  	  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
-@@ -9197,7 +9326,7 @@
+@@ -9170,17 +10307,17 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+-    echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+ if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9200,7 +10337,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -6462,7 +13790,52 @@
  	  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
-@@ -9292,68 +9421,25 @@
+@@ -9232,11 +10369,11 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+   else
+@@ -9251,21 +10388,21 @@
+ enable_dlopen=yes
+ enable_win32_dll=no
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++# Check whether --enable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++  enableval=$enable_libtool_lock;
++fi
+ 
+-fi;
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ 
+-# Check whether --with-pic or --without-pic was given.
++# Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
++  withval=$with_pic; pic_mode="$withval"
+ else
+   pic_mode=default
+-fi;
++fi
++
+ test -z "$pic_mode" && pic_mode=default
+ 
+ # Use C for the default configuration in the libtool script
+@@ -9295,68 +10432,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -6546,7 +13919,18 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9382,18 +9468,20 @@
+@@ -9370,8 +10464,8 @@
+   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ 
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9385,26 +10479,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -6554,13 +13938,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9388: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9474: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9391: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10485: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9392: \$? = $ac_status" >&5
-+   echo "$as_me:9478: \$? = $ac_status" >&5
+-   echo "$as_me:9395: \$? = $ac_status" >&5
++   echo "$as_me:10489: \$? = $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
@@ -6572,7 +13956,28 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -9454,6 +9542,11 @@
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+@@ -9418,8 +10514,8 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl='-Wl,'
+@@ -9457,6 +10553,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -6584,7 +13989,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9470,7 +9563,7 @@
+@@ -9473,7 +10574,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -6593,7 +13998,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9496,6 +9589,16 @@
+@@ -9499,6 +10600,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -6610,7 +14015,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9507,7 +9610,7 @@
+@@ -9510,7 +10621,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.
@@ -6619,7 +14024,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9530,13 +9633,20 @@
+@@ -9533,13 +10644,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -6642,7 +14047,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9551,15 +9661,15 @@
+@@ -9554,15 +10672,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -6664,7 +14069,7 @@
        ;;
  
      sunos4*)
-@@ -9568,7 +9678,7 @@
+@@ -9571,7 +10689,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -6673,7 +14078,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9581,6 +9691,17 @@
+@@ -9584,6 +10702,17 @@
        fi
        ;;
  
@@ -6691,7 +14096,28 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9615,18 +9736,20 @@
+@@ -9595,16 +10724,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9618,26 +10747,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -6699,13 +14125,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9621: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9742: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9624: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10753: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9625: \$? = $ac_status" >&5
-+   echo "$as_me:9746: \$? = $ac_status" >&5
+-   echo "$as_me:9628: \$? = $ac_status" >&5
++   echo "$as_me:10757: \$? = $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
@@ -6717,25 +14143,37 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-@@ -9647,7 +9770,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+     case $lt_prog_compiler_pic in
+@@ -9650,7 +10781,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=
-@@ -9657,6 +9780,48 @@
+@@ -9660,8 +10791,50 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -6762,8 +14200,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works" = xyes; then
 +    :
@@ -6772,10 +14210,12 @@
 +fi
 +
 +
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-@@ -9669,38 +9834,36 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9672,60 +10845,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -6796,13 +14236,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9688: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9846: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9691: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10857: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9692: \$? = $ac_status" >&5
-+   echo "$as_me:9850: \$? = $ac_status" >&5
+-   echo "$as_me:9695: \$? = $ac_status" >&5
++   echo "$as_me:10861: \$? = $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
@@ -6826,7 +14266,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9771,6 +9934,16 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -9735,8 +10906,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   runpath_var=
+   allow_undefined_flag=
+@@ -9774,6 +10945,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -6843,7 +14322,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9781,6 +9954,10 @@
+@@ -9784,6 +10965,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -6854,7 +14333,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9791,6 +9968,27 @@
+@@ -9794,6 +10979,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -6882,7 +14361,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9828,7 +10026,7 @@
+@@ -9831,7 +11037,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -6891,7 +14370,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9838,13 +10036,13 @@
+@@ -9841,13 +11047,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'
@@ -6908,7 +14387,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
-@@ -9853,23 +10051,70 @@
+@@ -9856,23 +11062,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -6984,7 +14463,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9883,13 +10128,40 @@
+@@ -9886,13 +11139,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7027,7 +14506,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9899,24 +10171,19 @@
+@@ -9902,24 +11182,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7059,7 +14538,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9928,7 +10195,7 @@
+@@ -9931,7 +11206,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -7068,7 +14547,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9950,9 +10217,21 @@
+@@ -9953,9 +11228,21 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -7092,7 +14571,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9969,7 +10248,7 @@
+@@ -9972,7 +11259,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -7101,7 +14580,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9988,8 +10267,12 @@
+@@ -9991,8 +11278,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -7114,7 +14593,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9997,22 +10280,23 @@
+@@ -10000,22 +11291,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -7145,17 +14624,14 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10036,8 +10320,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=$?
-@@ -10064,14 +10347,13 @@
+@@ -10062,19 +11354,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -7173,17 +14649,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10098,8 +10380,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=$?
-@@ -10131,13 +10412,11 @@
+@@ -10124,7 +11417,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10134,13 +11429,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -7200,7 +14676,7 @@
  	fi
        fi
        ;;
-@@ -10150,7 +10429,7 @@
+@@ -10153,7 +11446,7 @@
        ld_shlibs=no
        ;;
  
@@ -7209,7 +14685,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10160,13 +10439,13 @@
+@@ -10163,13 +11456,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -7226,7 +14702,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -10176,52 +10455,52 @@
+@@ -10179,52 +11472,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -7319,7 +14795,7 @@
      fi
        ;;
  
-@@ -10255,8 +10534,8 @@
+@@ -10258,8 +11551,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7330,7 +14806,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10264,7 +10543,7 @@
+@@ -10267,7 +11560,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -7339,7 +14815,7 @@
        else
  	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -10278,47 +10557,62 @@
+@@ -10281,47 +11574,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -7426,7 +14902,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10332,7 +10626,7 @@
+@@ -10335,7 +11643,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -7435,7 +14911,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'
-@@ -10342,7 +10636,7 @@
+@@ -10345,7 +11653,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -7444,7 +14920,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10365,7 +10659,8 @@
+@@ -10368,7 +11676,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
@@ -7454,7 +14930,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10375,7 +10670,7 @@
+@@ -10378,7 +11687,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -7463,7 +14939,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10386,14 +10681,14 @@
+@@ -10389,14 +11698,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -7480,7 +14956,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'
-@@ -10405,13 +10700,13 @@
+@@ -10408,13 +11717,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -7496,7 +14972,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10419,21 +10714,15 @@
+@@ -10422,21 +11731,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -7522,7 +14998,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10442,8 +10731,18 @@
+@@ -10445,8 +11748,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7543,7 +15019,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10452,7 +10751,7 @@
+@@ -10455,7 +11768,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.
@@ -7552,7 +15028,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10500,36 +10799,45 @@
+@@ -10503,36 +11816,45 @@
        fi
        ;;
  
@@ -7619,8 +15095,14 @@
        ;;
  
      uts4*)
-@@ -10548,11 +10856,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
+@@ -10547,15 +11869,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -7631,7 +15113,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10585,6 +10888,7 @@
+@@ -10573,8 +11890,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -10588,6 +11905,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -7639,7 +15132,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10620,7 +10924,7 @@
+@@ -10610,20 +11928,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -7648,7 +15158,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10630,7 +10934,20 @@
+@@ -10633,7 +11951,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7670,7 +15180,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10695,7 +11012,7 @@
+@@ -10698,7 +12029,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7679,7 +15189,7 @@
    ;;
  
  beos*)
-@@ -10704,7 +11021,7 @@
+@@ -10707,7 +12038,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -7688,7 +15198,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10720,7 +11037,7 @@
+@@ -10723,7 +12054,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -7697,7 +15207,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10732,7 +11049,8 @@
+@@ -10735,7 +12066,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -7707,7 +15217,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10762,7 +11080,7 @@
+@@ -10765,7 +12097,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7716,7 +15226,7 @@
        ;;
      esac
      ;;
-@@ -10785,7 +11103,7 @@
+@@ -10788,7 +12120,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -7725,7 +15235,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10808,20 +11126,17 @@
+@@ -10811,20 +12143,17 @@
    dynamic_linker=no
    ;;
  
@@ -7757,7 +15267,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10839,14 +11154,19 @@
+@@ -10842,14 +12171,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -7779,7 +15289,7 @@
    esac
    ;;
  
-@@ -10866,9 +11186,9 @@
+@@ -10869,9 +12203,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -7791,7 +15301,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10883,7 +11203,7 @@
+@@ -10886,7 +12220,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -7800,7 +15310,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10894,7 +11214,7 @@
+@@ -10897,7 +12231,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -7809,7 +15319,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10906,6 +11226,18 @@
+@@ -10909,6 +12243,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -7828,7 +15338,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10949,29 +11281,26 @@
+@@ -10952,29 +12298,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -7865,7 +15375,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10981,6 +11310,18 @@
+@@ -10984,6 +12327,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -7884,7 +15394,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10990,7 +11331,7 @@
+@@ -10993,7 +12348,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -7893,7 +15403,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11018,8 +11359,13 @@
+@@ -11021,8 +12376,13 @@
  
  openbsd*)
    version_type=sunos
@@ -7908,7 +15418,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -11039,7 +11385,7 @@
+@@ -11042,7 +12402,7 @@
  
  os2*)
    libname_spec='$name'
@@ -7917,7 +15427,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11057,13 +11403,6 @@
+@@ -11060,13 +12420,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -7931,7 +15441,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11089,7 +11428,7 @@
+@@ -11092,7 +12445,7 @@
    need_version=yes
    ;;
  
@@ -7940,7 +15450,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11122,6 +11461,29 @@
+@@ -11125,6 +12478,29 @@
    fi
    ;;
  
@@ -7970,17 +15480,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11137,12 +11499,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -11136,16 +12512,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
 -   test -n "$runpath_var " || \
@@ -7990,77 +15508,428 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11268,8 +11635,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=$?
-@@ -11372,8 +11738,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=$?
-@@ -11438,8 +11803,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=$?
-@@ -11532,8 +11896,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=$?
-@@ -11598,8 +11961,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=$?
-@@ -11665,8 +12027,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=$?
-@@ -11732,8 +12093,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=$?
-@@ -11792,7 +12152,7 @@
+@@ -11165,8 +12546,8 @@
+   # directories.
+   hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+ 
+ if test "$hardcode_action" = relink; then
+   # Fast installation is not supported
+@@ -11179,29 +12560,29 @@
+ 
+ striplib=
+ old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
+-         echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++         { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+        else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+        ;;
+    *)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     ;;
+   esac
+ fi
+@@ -11233,8 +12614,8 @@
+ 
+   darwin*)
+   # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11247,17 +12628,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11289,14 +12670,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+@@ -11310,8 +12692,8 @@
+    ;;
+ 
+   *)
+-    echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shl_load+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11338,30 +12720,24 @@
+ 
+ #undef shl_load
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_load ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
++#if defined __stub_shl_load || defined __stub___shl_load
+ choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != shl_load;
++return shl_load ();
+   ;
+   return 0;
+ }
+@@ -11393,18 +12769,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_shl_load=no
++	ac_cv_func_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+ if test $ac_cv_func_shl_load = yes; then
+   lt_cv_dlopen="shl_load"
+ else
+-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11417,17 +12794,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_load ();
+ int
+ main ()
+ {
+-shl_load ();
++return shl_load ();
+   ;
+   return 0;
+ }
+@@ -11459,19 +12836,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_shl_load=no
++	ac_cv_lib_dld_shl_load=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+ if test "${ac_cv_func_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11498,30 +12876,24 @@
+ 
+ #undef dlopen
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
++#if defined __stub_dlopen || defined __stub___dlopen
+ choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != dlopen;
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11553,18 +12925,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_dlopen=no
++	ac_cv_func_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+ if test $ac_cv_func_dlopen = yes; then
+   lt_cv_dlopen="dlopen"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11577,17 +12950,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11619,19 +12992,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11644,17 +13018,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -11686,19 +13060,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_svld_dlopen=no
++	ac_cv_lib_svld_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+ if test $ac_cv_lib_svld_dlopen = yes; then
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11711,17 +13086,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dld_link ();
+ int
+ main ()
+ {
+-dld_link ();
++return dld_link ();
+   ;
+   return 0;
+ }
+@@ -11753,14 +13128,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_dld_link=no
++	ac_cv_lib_dld_dld_link=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+@@ -11795,13 +13171,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -8069,16 +15938,24 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11808,7 +12168,7 @@
+ 
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+ if test "${lt_cv_dlopen_self+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11811,7 +13187,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11811 "configure"
-+#line 12171 "configure"
+-#line 11814 "configure"
++#line 13190 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11865,6 +12225,8 @@
+@@ -11868,6 +13244,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -8087,7 +15964,7 @@
  
      exit (status);
  }
-@@ -11874,12 +12236,12 @@
+@@ -11877,12 +13255,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -8102,25 +15979,35 @@
      esac
    else :
      # compilation failed
-@@ -11894,7 +12256,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+@@ -11893,13 +13271,13 @@
  
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+ 
      if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
- echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
  if test "${lt_cv_dlopen_self_static+set}" = set; then
-@@ -11906,7 +12268,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11909,7 +13287,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11909 "configure"
-+#line 12271 "configure"
+-#line 11912 "configure"
++#line 13290 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11963,6 +12325,8 @@
+@@ -11966,6 +13344,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -8129,7 +16016,7 @@
  
      exit (status);
  }
-@@ -11972,12 +12336,12 @@
+@@ -11975,12 +13355,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -8144,17 +16031,38 @@
      esac
    else :
      # compilation failed
-@@ -12010,7 +12374,7 @@
+@@ -11991,8 +13371,8 @@
+ 
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+     fi
  
+     CPPFLAGS="$save_CPPFLAGS"
+@@ -12013,19 +13393,19 @@
+ fi
  
+ 
 -# Report which librarie types wil actually be built
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
 +# Report which library types will actually be built
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: $can_build_shared" >&5
-@@ -12022,7 +12386,7 @@
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
  
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -8162,7 +16070,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12031,47 +12395,10 @@
+@@ -12034,58 +13414,21 @@
    fi
    ;;
  
@@ -8210,8 +16118,25 @@
 -  fi
      ;;
  esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12097,7 +12424,8 @@
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
+ 
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+ 
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -12100,7 +13443,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.
@@ -8221,7 +16146,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 \
-@@ -12211,11 +12539,11 @@
+@@ -12214,11 +13558,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -8235,7 +16160,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12245,6 +12573,12 @@
+@@ -12248,6 +13592,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -8248,7 +16173,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12256,6 +12590,9 @@
+@@ -12259,6 +13609,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -8258,7 +16183,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12275,7 +12612,7 @@
+@@ -12278,7 +13631,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -8267,7 +16192,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12306,7 +12643,7 @@
+@@ -12309,7 +13662,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -8276,7 +16201,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12321,7 +12658,7 @@
+@@ -12324,7 +13677,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -8285,7 +16210,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12548,7 +12885,10 @@
+@@ -12551,7 +13904,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.
@@ -8297,7 +16222,23 @@
  fi
  
  
-@@ -12583,6 +12923,9 @@
+@@ -12564,11 +13920,11 @@
+ CC="$lt_save_CC"
+ 
+ 
+-# Check whether --with-tags or --without-tags was given.
++# Check whether --with-tags was given.
+ if test "${with_tags+set}" = set; then
+-  withval="$with_tags"
+-  tagnames="$withval"
+-fi;
++  withval=$with_tags; tagnames="$withval"
++fi
++
+ 
+ if test -f "$ltmain" && test -n "$tagnames"; then
+   if test ! -f "${ofile}"; then
+@@ -12586,6 +13942,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -8307,18 +16248,20 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12613,7 +12956,9 @@
+@@ -12616,8 +13975,10 @@
  
        case $tagname in
        CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-	  ac_ext=cc
 +	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
++	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12633,6 +12978,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -12636,6 +13997,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -8326,7 +16269,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12650,7 +12996,7 @@
+@@ -12653,7 +14015,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -8335,7 +16278,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12660,17 +13006,34 @@
+@@ -12663,17 +14025,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -8371,7 +16314,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12681,18 +13044,27 @@
+@@ -12684,18 +14063,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -8402,7 +16345,48 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12763,7 +13135,7 @@
+@@ -12709,18 +14097,18 @@
+   # Set up default GNU C++ configuration
+ 
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++# Check whether --with-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+   with_gnu_ld=no
+-fi;
++fi
++
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -12749,11 +14137,11 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+ else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+ fi
+ if test "${lt_cv_path_LD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12766,7 +14154,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,
@@ -8411,7 +16395,27 @@
        # 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'*)
-@@ -12797,7 +13169,7 @@
+@@ -12786,21 +14174,21 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++  { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+ echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+    { (exit 1); exit 1; }; }
+-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8420,7 +16424,18 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12816,8 +13188,8 @@
+@@ -12810,8 +14198,8 @@
+   ;;
+ esac
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+@@ -12819,8 +14207,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
@@ -8431,7 +16446,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12843,7 +13215,7 @@
+@@ -12846,7 +14234,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.
@@ -8440,7 +16455,18 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12874,8 +13246,23 @@
+@@ -12861,8 +14249,8 @@
+ fi
+ 
+ # PORTME: fill in a description of your system's C++ link characteristics
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+   aix3*)
+@@ -12877,8 +14265,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -8466,7 +16492,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12892,7 +13279,7 @@
+@@ -12895,7 +14298,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -8475,7 +16501,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12911,8 +13298,12 @@
+@@ -12914,8 +14317,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -8488,7 +16514,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12921,15 +13312,16 @@
+@@ -12924,15 +14331,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -8509,18 +16535,17 @@
      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.
-@@ -12959,8 +13351,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=$?
-@@ -12989,13 +13380,12 @@
+@@ -12985,20 +14393,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
@@ -8535,17 +16560,17 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13022,8 +13412,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=$?
-@@ -13055,16 +13444,26 @@
+@@ -13048,7 +14457,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13058,16 +14469,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -8577,7 +16602,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13078,12 +13477,12 @@
+@@ -13081,12 +14502,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
      # as there is no search path for DLLs.
      hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -8592,7 +16617,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
-@@ -13092,70 +13491,81 @@
+@@ -13095,70 +14516,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -8726,7 +16751,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13166,14 +13576,14 @@
+@@ -13169,14 +14601,14 @@
  	;;
      esac
      ;;
@@ -8743,7 +16768,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13190,12 +13600,12 @@
+@@ -13193,12 +14625,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -8759,7 +16784,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13204,11 +13614,11 @@
+@@ -13207,11 +14639,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.
@@ -8773,7 +16798,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13218,33 +13628,22 @@
+@@ -13221,33 +14653,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -8814,7 +16839,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13255,17 +13654,20 @@
+@@ -13258,17 +14679,20 @@
      esac
  
      case $cc_basename in
@@ -8841,7 +16866,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13281,12 +13683,15 @@
+@@ -13284,12 +14708,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -8861,7 +16886,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13297,11 +13702,25 @@
+@@ -13300,11 +14727,25 @@
  	;;
      esac
      ;;
@@ -8889,7 +16914,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13312,9 +13731,9 @@
+@@ -13315,9 +14756,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -8901,7 +16926,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13323,16 +13742,16 @@
+@@ -13326,16 +14767,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -8922,7 +16947,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13350,20 +13769,44 @@
+@@ -13353,20 +14794,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -8973,7 +16998,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13391,7 +13834,7 @@
+@@ -13394,7 +14859,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -8982,7 +17007,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13401,7 +13844,7 @@
+@@ -13404,7 +14869,7 @@
  	;;
      esac
      ;;
@@ -8991,7 +17016,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13412,15 +13855,31 @@
+@@ -13415,15 +14880,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::"'
      ;;
@@ -9025,7 +17050,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13430,14 +13889,14 @@
+@@ -13433,14 +14914,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -9043,7 +17068,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13455,7 +13914,7 @@
+@@ -13458,7 +14939,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -9052,7 +17077,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13474,13 +13933,13 @@
+@@ -13477,13 +14958,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -9068,7 +17093,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13489,17 +13948,17 @@
+@@ -13492,17 +14973,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -9090,7 +17115,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13518,7 +13977,7 @@
+@@ -13521,7 +15002,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -9099,7 +17124,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13539,27 +13998,14 @@
+@@ -13542,27 +15023,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -9129,7 +17154,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13572,36 +14018,33 @@
+@@ -13575,36 +15043,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -9178,7 +17203,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13609,9 +14052,9 @@
+@@ -13612,9 +15077,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -9190,7 +17215,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13621,9 +14064,9 @@
+@@ -13624,9 +15089,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
@@ -9202,7 +17227,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13632,9 +14075,9 @@
+@@ -13635,9 +15100,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -9214,7 +17239,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13647,12 +14090,63 @@
+@@ -13650,12 +15115,63 @@
  	;;
      esac
      ;;
@@ -9280,7 +17305,18 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13709,7 +14203,7 @@
+@@ -13675,8 +15191,8 @@
+     ld_shlibs_CXX=no
+     ;;
+ esac
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+ GCC_CXX="$GXX"
+@@ -13712,7 +15228,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.
@@ -9289,7 +17325,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13749,7 +14243,7 @@
+@@ -13752,7 +15268,7 @@
         fi
         ;;
  
@@ -9298,7 +17334,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13785,6 +14279,29 @@
+@@ -13788,6 +15304,29 @@
  
  $rm -f confest.$objext
  
@@ -9328,7 +17364,18 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13832,6 +14349,10 @@
+@@ -13796,8 +15335,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   # C++ specific cases for pic, static, wl, etc.
+   if test "$GXX" = yes; then
+@@ -13835,6 +15374,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -9339,7 +17386,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13840,7 +14361,7 @@
+@@ -13843,7 +15386,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -9348,7 +17395,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13865,18 +14386,28 @@
+@@ -13868,18 +15411,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -9380,7 +17427,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13884,22 +14415,22 @@
+@@ -13887,22 +15440,22 @@
  	    ;;
  	esac
  	;;
@@ -9409,7 +17456,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13912,9 +14443,13 @@
+@@ -13915,9 +15468,13 @@
  	    ;;
  	esac
  	;;
@@ -9424,7 +17471,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13923,20 +14458,26 @@
+@@ -13926,20 +15483,26 @@
  	    ;;
  	esac
  	;;
@@ -9455,7 +17502,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13953,25 +14494,25 @@
+@@ -13956,25 +15519,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -9486,7 +17533,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13985,24 +14526,15 @@
+@@ -13988,24 +15551,15 @@
  	;;
        psos*)
  	;;
@@ -9513,7 +17560,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -14012,12 +14544,12 @@
+@@ -14015,12 +15569,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -9528,7 +17575,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14027,7 +14559,7 @@
+@@ -14030,7 +15584,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -9537,7 +17584,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14035,7 +14567,14 @@
+@@ -14038,7 +15592,14 @@
  	    ;;
  	esac
  	;;
@@ -9553,7 +17600,28 @@
  	;;
        vxworks*)
  	;;
-@@ -14068,18 +14607,20 @@
+@@ -14048,16 +15609,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14071,26 +15632,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -9561,13 +17629,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14074: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14613: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14077: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15638: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14078: \$? = $ac_status" >&5
-+   echo "$as_me:14617: \$? = $ac_status" >&5
+-   echo "$as_me:14081: \$? = $ac_status" >&5
++   echo "$as_me:15642: \$? = $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
@@ -9579,49 +17647,40 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-@@ -14100,7 +14641,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+     case $lt_prog_compiler_pic_CXX in
+@@ -14103,7 +15666,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=
-@@ -14110,50 +14651,90 @@
+@@ -14113,8 +15676,50 @@
      ;;
  esac
  
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_cv_prog_compiler_c_o_CXX=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
--   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.
--   # Note that $ac_compile itself does not contain backslashes and begins
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  lt_prog_compiler_static_works_CXX=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -9645,8 +17704,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
 +    :
@@ -9655,35 +17714,39 @@
 +fi
 +
 +
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   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.
-+   # Note that $ac_compile itself does not contain backslashes and begins
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -14125,60 +15730,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    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.
+    # 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:14141: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14717: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14144: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15742: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14145: \$? = $ac_status" >&5
-+   echo "$as_me:14721: \$? = $ac_status" >&5
+-   echo "$as_me:14148: \$? = $ac_status" >&5
++   echo "$as_me:15746: \$? = $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
@@ -9707,7 +17770,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14203,7 +14784,10 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -14188,8 +15791,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+@@ -14206,22 +15809,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -9719,8 +17821,13 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14214,11 +14798,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
+   ;;
+   esac
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+-echo "${ECHO_T}$ld_shlibs_CXX" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -9731,7 +17838,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14251,6 +14830,7 @@
+@@ -14239,8 +15840,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -14254,6 +15855,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -9739,7 +17857,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14286,7 +14866,7 @@
+@@ -14276,20 +15878,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -9748,7 +17883,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14296,7 +14876,20 @@
+@@ -14299,7 +15901,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9770,7 +17905,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14361,7 +14954,7 @@
+@@ -14364,7 +15979,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9779,7 +17914,7 @@
    ;;
  
  beos*)
-@@ -14370,7 +14963,7 @@
+@@ -14373,7 +15988,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -9788,7 +17923,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14386,7 +14979,7 @@
+@@ -14389,7 +16004,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -9797,7 +17932,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14398,7 +14991,8 @@
+@@ -14401,7 +16016,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -9807,7 +17942,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14428,7 +15022,7 @@
+@@ -14431,7 +16047,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9816,7 +17951,7 @@
        ;;
      esac
      ;;
-@@ -14451,7 +15045,7 @@
+@@ -14454,7 +16070,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -9825,7 +17960,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14474,20 +15068,17 @@
+@@ -14477,20 +16093,17 @@
    dynamic_linker=no
    ;;
  
@@ -9857,7 +17992,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14505,14 +15096,19 @@
+@@ -14508,14 +16121,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -9879,7 +18014,7 @@
    esac
    ;;
  
-@@ -14532,9 +15128,9 @@
+@@ -14535,9 +16153,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -9891,7 +18026,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14549,7 +15145,7 @@
+@@ -14552,7 +16170,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -9900,7 +18035,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14560,7 +15156,7 @@
+@@ -14563,7 +16181,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -9909,7 +18044,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14572,6 +15168,18 @@
+@@ -14575,6 +16193,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -9928,7 +18063,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14615,29 +15223,26 @@
+@@ -14618,29 +16248,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -9965,14 +18100,20 @@
    # 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,
-@@ -14647,6 +15252,18 @@
+@@ -14650,16 +16277,28 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
+-netbsd*)
+-  version_type=sunos
 +netbsdelf*-gnu)
 +  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
@@ -9981,19 +18122,21 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14656,7 +15273,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
    else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14684,8 +15301,13 @@
+@@ -14687,8 +16326,13 @@
  
  openbsd*)
    version_type=sunos
@@ -10008,7 +18151,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14705,7 +15327,7 @@
+@@ -14708,7 +16352,7 @@
  
  os2*)
    libname_spec='$name'
@@ -10017,7 +18160,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14723,13 +15345,6 @@
+@@ -14726,13 +16370,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -10031,7 +18174,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14755,7 +15370,7 @@
+@@ -14758,7 +16395,7 @@
    need_version=yes
    ;;
  
@@ -10040,7 +18183,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14788,6 +15403,29 @@
+@@ -14791,6 +16428,29 @@
    fi
    ;;
  
@@ -10070,17 +18213,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14803,12 +15441,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -14802,16 +16462,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
 -   test -n "$runpath_var CXX" || \
@@ -10090,7 +18241,18 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14840,1122 +15483,297 @@
+@@ -14831,8 +16496,8 @@
+   # directories.
+   hardcode_action_CXX=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+-echo "${ECHO_T}$hardcode_action_CXX" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+ 
+ if test "$hardcode_action_CXX" = relink; then
+   # Fast installation is not supported
+@@ -14843,1155 +16508,330 @@
    enable_fast_install=needless
  fi
  
@@ -10909,7 +19071,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15477 "configure"
+-#line 15480 "configure"
 -#include "confdefs.h"
 +# Compiler flag to generate thread-safe objects.
 +thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
@@ -11038,7 +19200,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15575 "configure"
+-#line 15578 "configure"
 -#include "confdefs.h"
 +# Dependencies to place before the objects being linked to create a
 +# shared library.
@@ -11090,24 +19252,33 @@
 -#    endif
 -#  endif
 -#endif
--
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+ 
 -    exit (status);
 -}
 -EOF
@@ -11129,31 +19300,45 @@
 -  fi
 -fi
 -rm -fr conftest*
--
--
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
--
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+ 
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
--
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
--
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
 -fi
--
--
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
+ 
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
 -# with your package, and you will get complaints that there are
@@ -11434,13 +19619,45 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+-
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+-
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
  
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-@@ -16067,7 +15885,10 @@
+ # Is shlibpath searched before the hard-coded library search path?
+ shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+@@ -16070,7 +16910,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.
@@ -11452,7 +19669,7 @@
  fi
  
  
-@@ -16139,16 +15960,42 @@
+@@ -16142,29 +16985,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -11492,12 +19709,23 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
+ 
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
 +
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
  
- echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
- echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16161,7 +16008,7 @@
- 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -11505,7 +19733,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16169,8 +16016,10 @@
+@@ -16172,21 +17041,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -11517,17 +19745,38 @@
 +  fi
    ;;
  esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16183,8 +16032,6 @@
- echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++{ echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6; }
  
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
+-
 -test "$ld_shlibs_F77" = no && can_build_shared=no
--
++{ echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6; }
+ 
  GCC_F77="$G77"
  LD_F77="$LD"
+@@ -16195,8 +17064,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
  
-@@ -16231,6 +16078,11 @@
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl_F77='-Wl,'
+@@ -16234,6 +17103,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -11539,7 +19788,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16247,7 +16099,7 @@
+@@ -16250,7 +17124,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -11548,7 +19797,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16273,6 +16125,16 @@
+@@ -16276,6 +17150,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -11565,7 +19814,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16284,7 +16146,7 @@
+@@ -16287,7 +17171,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.
@@ -11574,7 +19823,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16307,13 +16169,20 @@
+@@ -16310,13 +17194,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -11597,7 +19846,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16328,15 +16197,15 @@
+@@ -16331,15 +17222,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -11619,7 +19868,7 @@
        ;;
  
      sunos4*)
-@@ -16345,7 +16214,7 @@
+@@ -16348,7 +17239,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -11628,7 +19877,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16358,6 +16227,17 @@
+@@ -16361,6 +17252,17 @@
        fi
        ;;
  
@@ -11646,7 +19895,28 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16392,18 +16272,20 @@
+@@ -16372,16 +17274,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_F77"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16395,26 +17297,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -11654,13 +19924,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16398: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16278: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16401: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17303: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16402: \$? = $ac_status" >&5
-+   echo "$as_me:16282: \$? = $ac_status" >&5
+-   echo "$as_me:16405: \$? = $ac_status" >&5
++   echo "$as_me:17307: \$? = $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
@@ -11672,25 +19942,37 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-@@ -16424,7 +16306,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+     case $lt_prog_compiler_pic_F77 in
+@@ -16427,7 +17331,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=
-@@ -16434,6 +16316,48 @@
+@@ -16437,8 +17341,50 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_F77+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -11717,8 +19999,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_F77" = xyes; then
 +    :
@@ -11727,10 +20009,12 @@
 +fi
 +
 +
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-@@ -16446,38 +16370,36 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16449,60 +17395,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -11751,13 +20035,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16465: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16382: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16468: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17407: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16469: \$? = $ac_status" >&5
-+   echo "$as_me:16386: \$? = $ac_status" >&5
+-   echo "$as_me:16472: \$? = $ac_status" >&5
++   echo "$as_me:17411: \$? = $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
@@ -11781,7 +20065,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16548,6 +16470,16 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -16512,8 +17456,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   runpath_var=
+   allow_undefined_flag_F77=
+@@ -16551,6 +17495,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -11798,7 +20121,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16558,6 +16490,10 @@
+@@ -16561,6 +17515,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -11809,7 +20132,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16568,6 +16504,27 @@
+@@ -16571,6 +17529,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -11837,7 +20160,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16605,7 +16562,7 @@
+@@ -16608,7 +17587,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -11846,7 +20169,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16615,13 +16572,13 @@
+@@ -16618,13 +17597,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'
@@ -11863,7 +20186,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16630,23 +16587,70 @@
+@@ -16633,23 +17612,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -11940,7 +20263,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16660,13 +16664,40 @@
+@@ -16663,13 +17689,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -11983,7 +20306,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16676,24 +16707,19 @@
+@@ -16679,24 +17732,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12015,7 +20338,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16705,7 +16731,7 @@
+@@ -16708,7 +17756,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -12024,7 +20347,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16727,9 +16753,21 @@
+@@ -16730,9 +17778,21 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -12048,7 +20371,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16746,7 +16784,7 @@
+@@ -16749,7 +17809,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -12057,7 +20380,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16765,8 +16803,12 @@
+@@ -16768,8 +17828,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -12070,7 +20393,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16774,22 +16816,23 @@
+@@ -16777,22 +17841,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -12101,17 +20424,14 @@
        program main
  
        end
-@@ -16803,8 +16846,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -16831,14 +16873,13 @@
+@@ -16829,19 +17894,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -12129,17 +20449,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16855,8 +16896,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -16888,13 +16928,11 @@
+@@ -16881,7 +17947,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -16891,13 +17959,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -12156,7 +20476,7 @@
  	fi
        fi
        ;;
-@@ -16907,7 +16945,7 @@
+@@ -16910,7 +17976,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -12165,7 +20485,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16917,68 +16955,68 @@
+@@ -16920,68 +17986,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -12278,7 +20598,7 @@
      fi
        ;;
  
-@@ -17012,8 +17050,8 @@
+@@ -17015,8 +18081,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12289,7 +20609,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17021,7 +17059,7 @@
+@@ -17024,7 +18090,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -12298,7 +20618,7 @@
        else
  	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -17035,49 +17073,64 @@
+@@ -17038,47 +18104,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -12367,30 +20687,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
 -	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
  	  hardcode_direct_F77=no
  	  hardcode_shlibpath_var_F77=no
- 	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_F77='-L$libdir'
--	  hardcode_direct_F77=no
--	  hardcode_shlibpath_var_F77=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_F77=yes
--	  ;;
--	*)
+ 	  ;;
+ 	*)
 -	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_F77=:
--	  hardcode_direct_F77=yes
--	  export_dynamic_flag_spec_F77='${wl}-E'
-+	*)
-+	  hardcode_direct_F77=yes
-+	  export_dynamic_flag_spec_F77='${wl}-E'
+ 	  hardcode_direct_F77=yes
+ 	  export_dynamic_flag_spec_F77='${wl}-E'
  
- 	  # hardcode_minus_L: Not really in the search PATH,
- 	  # but as the default location of the library.
-@@ -17089,7 +17142,7 @@
+@@ -17092,7 +18173,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -12399,7 +20714,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'
-@@ -17099,7 +17152,7 @@
+@@ -17102,7 +18183,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -12408,7 +20723,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17122,7 +17175,8 @@
+@@ -17125,7 +18206,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
@@ -12418,7 +20733,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17132,7 +17186,7 @@
+@@ -17135,7 +18217,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -12427,7 +20742,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17143,14 +17197,14 @@
+@@ -17146,14 +18228,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -12444,7 +20759,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'
-@@ -17162,13 +17216,13 @@
+@@ -17165,13 +18247,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -12460,7 +20775,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17176,21 +17230,15 @@
+@@ -17179,21 +18261,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -12486,7 +20801,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17199,8 +17247,18 @@
+@@ -17202,8 +18278,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -12507,7 +20822,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17209,7 +17267,7 @@
+@@ -17212,7 +18298,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.
@@ -12516,7 +20831,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17257,36 +17315,45 @@
+@@ -17260,36 +18346,45 @@
        fi
        ;;
  
@@ -12583,8 +20898,14 @@
        ;;
  
      uts4*)
-@@ -17305,11 +17372,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
+@@ -17304,15 +18399,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12595,7 +20916,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17342,6 +17404,7 @@
+@@ -17330,8 +18420,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -17345,6 +18435,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -12603,7 +20935,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17377,7 +17440,7 @@
+@@ -17367,20 +18458,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -12612,7 +20961,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17387,7 +17450,20 @@
+@@ -17390,7 +18481,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -12634,7 +20983,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17452,7 +17528,7 @@
+@@ -17455,7 +18559,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -12643,7 +20992,7 @@
    ;;
  
  beos*)
-@@ -17461,7 +17537,7 @@
+@@ -17464,7 +18568,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -12652,7 +21001,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17477,7 +17553,7 @@
+@@ -17480,7 +18584,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -12661,7 +21010,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17489,7 +17565,8 @@
+@@ -17492,7 +18596,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -12671,7 +21020,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17519,7 +17596,7 @@
+@@ -17522,7 +18627,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -12680,7 +21029,7 @@
        ;;
      esac
      ;;
-@@ -17542,7 +17619,7 @@
+@@ -17545,7 +18650,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -12689,7 +21038,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17565,20 +17642,17 @@
+@@ -17568,20 +18673,17 @@
    dynamic_linker=no
    ;;
  
@@ -12721,7 +21070,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17596,14 +17670,19 @@
+@@ -17599,14 +18701,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -12743,7 +21092,7 @@
    esac
    ;;
  
-@@ -17623,9 +17702,9 @@
+@@ -17626,9 +18733,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -12755,7 +21104,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17640,7 +17719,7 @@
+@@ -17643,7 +18750,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -12764,7 +21113,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17651,7 +17730,7 @@
+@@ -17654,7 +18761,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -12773,7 +21122,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17663,6 +17742,18 @@
+@@ -17666,6 +18773,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -12792,7 +21141,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17706,29 +17797,26 @@
+@@ -17709,29 +18828,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -12829,7 +21178,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17738,6 +17826,18 @@
+@@ -17741,6 +18857,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -12848,7 +21197,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17747,7 +17847,7 @@
+@@ -17750,7 +18878,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -12857,7 +21206,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17775,8 +17875,13 @@
+@@ -17778,8 +18906,13 @@
  
  openbsd*)
    version_type=sunos
@@ -12872,7 +21221,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17796,7 +17901,7 @@
+@@ -17799,7 +18932,7 @@
  
  os2*)
    libname_spec='$name'
@@ -12881,7 +21230,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17814,13 +17919,6 @@
+@@ -17817,13 +18950,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -12895,7 +21244,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17846,7 +17944,7 @@
+@@ -17849,7 +18975,7 @@
    need_version=yes
    ;;
  
@@ -12904,10 +21253,13 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17879,6 +17977,29 @@
+@@ -17882,9 +19008,32 @@
    fi
    ;;
  
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -12931,20 +21283,31 @@
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
 +
- uts4*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17894,12 +18015,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+@@ -17893,16 +19042,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
- echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
 -   test -n "$runpath_var F77" || \
@@ -12954,7 +21317,18 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17931,36 +18057,6 @@
+@@ -17922,8 +19076,8 @@
+   # directories.
+   hardcode_action_F77=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+-echo "${ECHO_T}$hardcode_action_F77" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6; }
+ 
+ if test "$hardcode_action_F77" = relink; then
+   # Fast installation is not supported
+@@ -17934,36 +19088,6 @@
    enable_fast_install=needless
  fi
  
@@ -12991,7 +21365,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17975,7 +18071,8 @@
+@@ -17978,7 +19102,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.
@@ -13001,7 +21375,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 \
-@@ -18075,6 +18172,12 @@
+@@ -18078,6 +19203,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -13014,7 +21388,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18086,6 +18189,9 @@
+@@ -18089,6 +19220,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -13024,7 +21398,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18105,7 +18211,7 @@
+@@ -18108,7 +19242,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -13033,7 +21407,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18136,7 +18242,7 @@
+@@ -18139,7 +19273,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -13042,7 +21416,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18151,7 +18257,7 @@
+@@ -18154,7 +19288,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -13051,7 +21425,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18353,7 +18459,10 @@
+@@ -18356,7 +19490,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.
@@ -13063,7 +21437,15 @@
  fi
  
  
-@@ -18386,26 +18495,55 @@
+@@ -18377,7 +19514,6 @@
+ 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ 
+ 
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
+ 
+@@ -18389,26 +19525,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -13120,7 +21502,18 @@
  ## 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
-@@ -18432,18 +18570,20 @@
+@@ -18420,8 +19585,8 @@
+   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
+ 
+ 
+-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18435,26 +19600,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -13128,13 +21521,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18438: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18576: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18441: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19606: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18442: \$? = $ac_status" >&5
-+   echo "$as_me:18580: \$? = $ac_status" >&5
+-   echo "$as_me:18445: \$? = $ac_status" >&5
++   echo "$as_me:19610: \$? = $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
@@ -13146,7 +21539,28 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -18504,6 +18644,11 @@
+    $rm conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
+@@ -18468,8 +19635,8 @@
+ lt_prog_compiler_pic_GCJ=
+ lt_prog_compiler_static_GCJ=
+ 
+-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+ 
+   if test "$GCC" = yes; then
+     lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -18507,6 +19674,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -13158,7 +21572,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18520,7 +18665,7 @@
+@@ -18523,7 +19695,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -13167,7 +21581,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18546,6 +18691,16 @@
+@@ -18549,6 +19721,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -13184,7 +21598,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18557,7 +18712,7 @@
+@@ -18560,7 +19742,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.
@@ -13193,7 +21607,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18580,13 +18735,20 @@
+@@ -18583,13 +19765,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -13216,7 +21630,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18601,15 +18763,15 @@
+@@ -18604,15 +19793,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -13238,7 +21652,7 @@
        ;;
  
      sunos4*)
-@@ -18618,7 +18780,7 @@
+@@ -18621,7 +19810,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -13247,7 +21661,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18631,6 +18793,17 @@
+@@ -18634,6 +19823,17 @@
        fi
        ;;
  
@@ -13265,7 +21679,28 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18665,18 +18838,20 @@
+@@ -18645,16 +19845,16 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic_GCJ"; then
+ 
+-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18668,26 +19868,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -13273,13 +21708,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18671: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18844: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18674: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19874: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18675: \$? = $ac_status" >&5
-+   echo "$as_me:18848: \$? = $ac_status" >&5
+-   echo "$as_me:18678: \$? = $ac_status" >&5
++   echo "$as_me:19878: \$? = $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
@@ -13291,25 +21726,37 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-@@ -18697,7 +18872,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+     case $lt_prog_compiler_pic_GCJ in
+@@ -18700,7 +19902,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=
-@@ -18707,6 +18882,48 @@
+@@ -18710,8 +19912,50 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -13336,8 +21783,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
 +    :
@@ -13346,10 +21793,12 @@
 +fi
 +
 +
- echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
- echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-@@ -18719,38 +18936,36 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18722,60 +19966,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -13370,13 +21819,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18738: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18948: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18741: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19978: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18742: \$? = $ac_status" >&5
-+   echo "$as_me:18952: \$? = $ac_status" >&5
+-   echo "$as_me:18745: \$? = $ac_status" >&5
++   echo "$as_me:19982: \$? = $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
@@ -13400,7 +21849,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18821,6 +19036,16 @@
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+ 
+ 
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$as_me:$LINENO: result: $hard_links" >&5
+-echo "${ECHO_T}$hard_links" >&6
++  { echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6; }
+   if test "$hard_links" = no; then
+     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+@@ -18785,8 +20027,8 @@
+   need_locks=no
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ 
+   runpath_var=
+   allow_undefined_flag_GCJ=
+@@ -18824,6 +20066,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -13417,7 +21905,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18831,6 +19056,10 @@
+@@ -18834,6 +20086,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -13428,7 +21916,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18841,6 +19070,27 @@
+@@ -18844,6 +20100,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -13456,7 +21944,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18878,7 +19128,7 @@
+@@ -18881,7 +20158,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -13465,7 +21953,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18888,13 +19138,13 @@
+@@ -18891,13 +20168,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'
@@ -13482,7 +21970,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18903,23 +19153,70 @@
+@@ -18906,23 +20183,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -13559,7 +22047,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18933,13 +19230,40 @@
+@@ -18936,13 +20260,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -13602,7 +22090,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18949,24 +19273,19 @@
+@@ -18952,24 +20303,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -13634,7 +22122,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18978,7 +19297,7 @@
+@@ -18981,7 +20327,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -13643,7 +22131,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -19000,9 +19319,21 @@
+@@ -19003,9 +20349,21 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -13667,7 +22155,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19019,7 +19350,7 @@
+@@ -19022,7 +20380,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -13676,7 +22164,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -19038,8 +19369,12 @@
+@@ -19041,8 +20399,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -13689,7 +22177,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19047,22 +19382,23 @@
+@@ -19050,22 +20412,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -13720,17 +22208,14 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19086,8 +19422,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=$?
-@@ -19114,14 +19449,13 @@
+@@ -19112,19 +20475,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -13748,17 +22233,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19148,8 +19482,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=$?
-@@ -19181,13 +19514,11 @@
+@@ -19174,7 +20538,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -19184,13 +20550,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -13775,7 +22260,7 @@
  	fi
        fi
        ;;
-@@ -19200,7 +19531,7 @@
+@@ -19203,7 +20567,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -13784,7 +22269,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19210,68 +19541,68 @@
+@@ -19213,68 +20577,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -13897,7 +22382,7 @@
      fi
        ;;
  
-@@ -19305,8 +19636,8 @@
+@@ -19308,8 +20672,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -13908,7 +22393,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19314,7 +19645,7 @@
+@@ -19317,7 +20681,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -13917,7 +22402,7 @@
        else
  	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -19328,47 +19659,62 @@
+@@ -19331,47 +20695,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -14004,7 +22489,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19382,7 +19728,7 @@
+@@ -19385,7 +20764,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -14013,7 +22498,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'
-@@ -19392,7 +19738,7 @@
+@@ -19395,7 +20774,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -14022,7 +22507,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19415,7 +19761,8 @@
+@@ -19418,7 +20797,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
@@ -14032,7 +22517,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19425,7 +19772,7 @@
+@@ -19428,7 +20808,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -14041,7 +22526,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19436,14 +19783,14 @@
+@@ -19439,14 +20819,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -14058,7 +22543,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'
-@@ -19455,13 +19802,13 @@
+@@ -19458,13 +20838,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -14074,7 +22559,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19469,21 +19816,15 @@
+@@ -19472,21 +20852,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -14100,7 +22585,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19492,8 +19833,18 @@
+@@ -19495,8 +20869,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -14121,7 +22606,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19502,7 +19853,7 @@
+@@ -19505,7 +20889,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.
@@ -14130,7 +22615,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19550,36 +19901,45 @@
+@@ -19553,36 +20937,45 @@
        fi
        ;;
  
@@ -14197,8 +22682,14 @@
        ;;
  
      uts4*)
-@@ -19598,11 +19958,6 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+@@ -19597,15 +20990,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -14209,7 +22700,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19635,6 +19990,7 @@
+@@ -19623,8 +21011,8 @@
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+@@ -19638,6 +21026,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -14217,7 +22719,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19670,7 +20026,7 @@
+@@ -19660,20 +21049,20 @@
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -14226,7 +22745,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19680,7 +20036,20 @@
+@@ -19683,7 +21072,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -14248,7 +22767,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19745,7 +20114,7 @@
+@@ -19748,7 +21150,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -14257,7 +22776,7 @@
    ;;
  
  beos*)
-@@ -19754,7 +20123,7 @@
+@@ -19757,7 +21159,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -14266,7 +22785,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19770,7 +20139,7 @@
+@@ -19773,7 +21175,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -14275,7 +22794,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19782,7 +20151,8 @@
+@@ -19785,7 +21187,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -14285,7 +22804,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19812,7 +20182,7 @@
+@@ -19815,7 +21218,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -14294,7 +22813,7 @@
        ;;
      esac
      ;;
-@@ -19835,7 +20205,7 @@
+@@ -19838,7 +21241,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -14303,7 +22822,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19858,20 +20228,17 @@
+@@ -19861,20 +21264,17 @@
    dynamic_linker=no
    ;;
  
@@ -14335,7 +22854,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19889,14 +20256,19 @@
+@@ -19892,14 +21292,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -14357,7 +22876,7 @@
    esac
    ;;
  
-@@ -19916,9 +20288,9 @@
+@@ -19919,9 +21324,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -14369,7 +22888,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19933,7 +20305,7 @@
+@@ -19936,7 +21341,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -14378,7 +22897,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19944,7 +20316,7 @@
+@@ -19947,7 +21352,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -14387,62 +22906,37 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19954,1109 +20326,321 @@
-   esac
-   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+@@ -19959,6 +21364,18 @@
    postinstall_cmds='chmod 555 $lib'
--  ;;
--
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
--  esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
--    ;;
--  *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
--    ;;
--  esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  hardcode_into_libs=yes
--  ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
--  dynamic_linker=no
--  ;;
--
--# This must be Linux ELF.
+   ;;
+ 
++interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -20002,29 +21419,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
 -linux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
@@ -14450,100 +22944,80 @@
 -      libsuff=64
 -    fi
 -  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
 -  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
 -  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--  # This implies no fast_install, which is unacceptable.
--  # Some rework will be needed to allow for fast_install
--  # before this can be enabled.
--  hardcode_into_libs=yes
--
--  # 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,
--  # most powerpc-linux boxes support dynamic linking these days and
--  # people can always --disable-shared, the test was removed, and we
--  # assume the GNU/Linux dynamic linker is in use.
--  dynamic_linker='GNU/Linux ld.so'
--  ;;
--
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # 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,
+@@ -20034,6 +21448,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -20043,7 +21469,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  ;;
--
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
--nto-qnx*)
--  version_type=linux
--  need_lib_prefix=no
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+@@ -20071,8 +21497,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   need_lib_prefix=no
 -  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
--openbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  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
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case $host_os in
--      openbsd2.[89] | openbsd2.[89].*)
--	shlibpath_overrides_runpath=no
--	;;
--      *)
--	shlibpath_overrides_runpath=yes
--	;;
--      esac
--  else
--    shlibpath_overrides_runpath=yes
--  fi
--  ;;
--
--os2*)
--  libname_spec='$name'
++  # 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
+@@ -20092,7 +21523,7 @@
+ 
+ os2*)
+   libname_spec='$name'
 -  shrext=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
--  ;;
--
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
--  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
--  ;;
--
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -20110,13 +21541,6 @@
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
 -sco3.2v5*)
 -  version_type=osf
 -  soname_spec='${libname}${release}${shared_ext}$major'
@@ -14551,69 +23025,32 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
 -
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
--
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
--  ;;
--
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -20142,7 +21566,7 @@
+   need_version=yes
+   ;;
+ 
 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
--  esac
--  ;;
--
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
--    soname_spec='$libname${shared_ext}.$major'
--    shlibpath_var=LD_LIBRARY_PATH
--  fi
--  ;;
--
++sysv4 | sysv4.3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+@@ -20175,891 +21599,84 @@
+   fi
+   ;;
+ 
 -uts4*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
 -  ;;
 -
 -*)
@@ -14640,10 +23077,21 @@
 -     test "$hardcode_minus_L_GCJ" != no; then
 -    # Linking always hardcodes the temporary library directory.
 -    hardcode_action_GCJ=relink
--  else
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
+   else
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action_GCJ=immediate
--  fi
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
+   fi
 -else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
@@ -14841,7 +23289,9 @@
 -#ifdef __cplusplus
 -}
 -#endif
--
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
+ 
 -int
 -main ()
 -{
@@ -15248,175 +23698,31 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
-+  ;;
- 
-+interix3*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
- 
+-
+-
 -fi
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
- 
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
- 
+-
+-
 -fi
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
- 
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
- 
+-
+-
 -fi
-+  # 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,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
- 
+-
+-
 -fi
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
- 
+-
+-
 -fi
-+nto-qnx*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
- 
+-
 -    ;;
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # 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
+-  esac
 -
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
-+  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
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-   else
+-  else
 -    enable_dlopen=no
-+    shlibpath_overrides_runpath=yes
-   fi
-+  ;;
- 
+-  fi
+-
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
@@ -15439,7 +23745,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20861 "configure"
+-#line 20864 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
@@ -15447,15 +23753,7 @@
 -#endif
 -
 -#include <stdio.h>
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -15465,17 +23763,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
- 
+-
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -15497,78 +23785,24 @@
 -#    endif
 -#  endif
 -#endif
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
- 
+-
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
- 
+-
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -15583,29 +23817,11 @@
 -      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
 -      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
 -      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+    shlibpath_overrides_runpath=no
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    shlibpath_overrides_runpath=yes
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-     esac
+-    esac
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
-   fi
+-  fi
 -fi
 -rm -fr conftest*
 -
@@ -15627,7 +23843,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20959 "configure"
+-#line 20962 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
@@ -15671,35 +23887,20 @@
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
- 
+-
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
-+test "$dynamic_linker" = no && can_build_shared=no
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -15719,19 +23920,47 @@
 -    # compilation failed
 -    lt_cv_dlopen_self_static=no
 -  fi
+-fi
+-rm -fr conftest*
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
++*)
++  dynamic_linker=no
++  ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = no && can_build_shared=no
+ 
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
--rm -fr conftest*
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
  
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 +hardcode_action_GCJ=
 +if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 +   test -n "$runpath_var_GCJ" || \
 +   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
  
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_GCJ" != no &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -15749,23 +23978,9 @@
 +  # We cannot hardcode anything, or else we can only hardcode existing
 +  # directories.
 +  hardcode_action_GCJ=unsupported
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
--
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
-+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6
++fi
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
  
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -15781,7 +23996,7 @@
  fi
  
  
-@@ -21073,7 +20657,8 @@
+@@ -21076,7 +21693,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.
@@ -15791,7 +24006,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 \
-@@ -21173,6 +20758,12 @@
+@@ -21176,6 +21794,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -15804,7 +24019,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21184,6 +20775,9 @@
+@@ -21187,6 +21811,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -15814,7 +24029,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21203,7 +20797,7 @@
+@@ -21206,7 +21833,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -15823,7 +24038,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21234,7 +20828,7 @@
+@@ -21237,7 +21864,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -15832,7 +24047,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21249,7 +20843,7 @@
+@@ -21252,7 +21879,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -15841,7 +24056,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21451,7 +21045,10 @@
+@@ -21454,7 +22081,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.
@@ -15853,7 +24068,15 @@
  fi
  
  
-@@ -21490,15 +21087,42 @@
+@@ -21474,7 +22104,6 @@
+       RC)
+ 
+ 
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
+ 
+@@ -21493,15 +22122,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -15896,7 +24119,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21514,7 +21138,8 @@
+@@ -21517,7 +22173,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.
@@ -15906,7 +24129,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 \
-@@ -21614,6 +21239,12 @@
+@@ -21617,6 +22274,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -15919,7 +24142,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21625,6 +21256,9 @@
+@@ -21628,6 +22291,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -15929,7 +24152,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21644,7 +21278,7 @@
+@@ -21647,7 +22313,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -15938,7 +24161,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21675,7 +21309,7 @@
+@@ -21678,7 +22344,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -15947,7 +24170,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21690,7 +21324,7 @@
+@@ -21693,7 +22359,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -15956,7 +24179,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21892,7 +21526,10 @@
+@@ -21895,7 +22561,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.
@@ -15968,7 +24191,7 @@
  fi
  
  
-@@ -21939,7 +21576,7 @@
+@@ -21942,7 +22611,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -15977,17 +24200,182 @@
  
  # Prevent multiple expansion
  
-@@ -22180,8 +21817,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=$?
-@@ -22255,9 +21891,6 @@
+@@ -21997,8 +22666,8 @@
+ 
+     # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22024,17 +22693,17 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test -n "$MSGFMT"; then
+-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
+-echo "${ECHO_T}$MSGFMT" >&6
++  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+     # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_GMSGFMT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22049,32 +22718,33 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+   ;;
+ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+-
+ if test -n "$GMSGFMT"; then
+-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+-echo "${ECHO_T}$GMSGFMT" >&6
++  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
+-        echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
++        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
+         GMSGFMT=":"
+       fi
+       MSGFMT=$GMSGFMT
+@@ -22083,8 +22753,8 @@
+ 
+       # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XGETTEXT+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22110,11 +22780,11 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test -n "$XGETTEXT"; then
+-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+-echo "${ECHO_T}$XGETTEXT" >&6
++  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -22122,8 +22792,8 @@
+ 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ 	  : ;
+ 	else
+-	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
+-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
++	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
+ 	  XGETTEXT=":"
+ 	fi
+       fi
+@@ -22133,8 +22803,7 @@
+ 
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22146,8 +22815,8 @@
+     ac_save_CXXFLAGS="$CXXFLAGS"
+     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
+ 
+-    echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
+-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
++echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
+     if test "${kde_cv_stl_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22201,15 +22870,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_stl_works=no
++	kde_cv_stl_works=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
+-echo "${ECHO_T}$kde_cv_stl_works" >&6
++   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
++echo "${ECHO_T}$kde_cv_stl_works" >&6; }
+ 
+    if test "$kde_cv_stl_works" = "yes"; then
+      # back compatible
+@@ -22238,15 +22908,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcat" >&5
+-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcat" >&5
++echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22258,9 +22927,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15997,27 +24385,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22291,8 +21924,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=$?
-@@ -22396,8 +22028,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=$?
-@@ -22476,9 +22107,6 @@
+@@ -22312,8 +22978,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcat=no
++	kde_cv_func_strlcat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22327,11 +22994,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
++echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
++echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22352,8 +23019,7 @@
+ if test "x$kde_cv_proto_strlcat" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22418,9 +23084,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcat="strlcat unavailable"
++	kde_cv_proto_strlcat="strlcat unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22434,8 +23101,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
+ 
+ if test "x$kde_cv_func_strlcat" = xyes; then
+ 
+@@ -22459,15 +23126,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for strlcpy" >&5
+-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for strlcpy" >&5
++echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
+ if test "${kde_cv_func_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22479,9 +23145,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16027,247 +24474,1341 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22511,8 +22139,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22615,8 +22242,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=$?
-@@ -22706,8 +22332,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=$?
-@@ -22768,8 +22393,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=$?
-@@ -22837,8 +22461,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=$?
-@@ -22904,8 +22527,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=$?
-@@ -22998,8 +22620,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=$?
-@@ -23077,8 +22698,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=$?
-@@ -23162,8 +22782,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=$?
-@@ -23231,8 +22850,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=$?
-@@ -23327,8 +22945,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=$?
-@@ -23392,8 +23009,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=$?
-@@ -23488,8 +23104,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=$?
-@@ -23553,8 +23168,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=$?
-@@ -23650,8 +23264,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=$?
-@@ -23715,8 +23328,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=$?
-@@ -23813,8 +23425,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=$?
-@@ -23879,8 +23490,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=$?
-@@ -23948,8 +23558,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=$?
-@@ -24100,8 +23709,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=$?
-@@ -24256,8 +23864,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=$?
-@@ -24322,8 +23929,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=$?
-@@ -24470,8 +24076,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=$?
-@@ -24626,8 +24231,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=$?
-@@ -24683,9 +24287,6 @@
+@@ -22532,8 +23195,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcpy=no
++	kde_cv_func_strlcpy=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22547,11 +23211,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
+-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
++echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_strlcpy+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22572,8 +23236,7 @@
+ if test "x$kde_cv_proto_strlcpy" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -22637,9 +23300,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_strlcpy="strlcpy unavailable"
++	kde_cv_proto_strlcpy="strlcpy unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22653,8 +23317,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
+ 
+ if test "x$kde_cv_func_strlcpy" = xyes; then
+ 
+@@ -22677,8 +23341,8 @@
+ 
+ 
+ 
+-      echo "$as_me:$LINENO: checking for main in -lutil" >&5
+-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
++echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22695,7 +23359,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -22727,20 +23391,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_util_main=no
++	ac_cv_lib_util_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
++echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
+ if test $ac_cv_lib_util_main = yes; then
+   LIBUTIL="-lutil"
+ fi
+ 
+-   echo "$as_me:$LINENO: checking for main in -lcompat" >&5
+-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
++echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_compat_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22757,7 +23422,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -22789,21 +23454,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_compat_main=no
++	ac_cv_lib_compat_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
++echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
+ if test $ac_cv_lib_compat_main = yes; then
+   LIBCOMPAT="-lcompat"
+ fi
+ 
+    kde_have_crypt=
+-   echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
++echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_crypt_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22816,17 +23482,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+   ;
+   return 0;
+ }
+@@ -22858,19 +23524,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_crypt_crypt=no
++	ac_cv_lib_crypt_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
+ if test $ac_cv_lib_crypt_crypt = yes; then
+   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
+ else
+-  echo "$as_me:$LINENO: checking for crypt in -lc" >&5
+-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
++echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22883,17 +23550,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char crypt ();
+ int
+ main ()
+ {
+-crypt ();
++return crypt ();
+   ;
+   return 0;
+ }
+@@ -22925,14 +23592,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_c_crypt=no
++	ac_cv_lib_c_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
+-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
++echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
+ if test $ac_cv_lib_c_crypt = yes; then
+   kde_have_crypt=yes
+ else
+@@ -22958,13 +23626,13 @@
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for socklen_t" >&5
+-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+    if test "${kde_cv_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-      ac_ext=cc
++      ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -23022,7 +23690,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+       ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23033,17 +23703,17 @@
+ 
+ fi
+ 
+-   echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t" >&6
++   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
++echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
+    if test $kde_cv_socklen_t = no; then
+-      echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
+-echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
++echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
+       if test "${kde_cv_socklen_t_equiv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+          kde_cv_socklen_t_equiv=int
+-         ac_ext=cc
++         ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -23101,7 +23771,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+          done
+          ac_ext=c
+@@ -23113,8 +23785,8 @@
+ 
+ fi
+ 
+-      echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
+-echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
++echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
+    fi
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -23127,8 +23799,8 @@
+ _ACEOF
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23141,17 +23813,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23183,21 +23855,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_dnet_ntoa=no
++	ac_cv_lib_dnet_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23210,17 +23883,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
+ int
+ main ()
+ {
+-dnet_ntoa ();
++return dnet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23252,21 +23925,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dnet_stub_dnet_ntoa=no
++	ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for inet_ntoa" >&5
+-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
++echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
+ if test "${ac_cv_func_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23293,30 +23967,24 @@
+ 
+ #undef inet_ntoa
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char inet_ntoa ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
++#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
+ choke me
+-#else
+-char (*f) () = inet_ntoa;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != inet_ntoa;
++return inet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23348,17 +24016,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_inet_ntoa=no
++	ac_cv_func_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
+ 
+    if test $ac_cv_func_inet_ntoa = no; then
+-     echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
++echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23371,17 +24040,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char inet_ntoa ();
+ int
+ main ()
+ {
+-inet_ntoa ();
++return inet_ntoa ();
+   ;
+   return 0;
+ }
+@@ -23413,21 +24082,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_inet_ntoa=no
++	ac_cv_lib_nsl_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+    fi
+-   echo "$as_me:$LINENO: checking for connect" >&5
+-echo $ECHO_N "checking for connect... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23454,30 +24124,24 @@
+ 
+ #undef connect
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char connect ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_connect) || defined (__stub___connect)
++#if defined __stub_connect || defined __stub___connect
+ choke me
+-#else
+-char (*f) () = connect;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != connect;
++return connect ();
+   ;
+   return 0;
+ }
+@@ -23509,17 +24173,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_connect=no
++	ac_cv_func_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-echo "${ECHO_T}$ac_cv_func_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+ 
+    if test $ac_cv_func_connect = no; then
+-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23532,17 +24197,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char connect ();
+ int
+ main ()
+ {
+-connect ();
++return connect ();
+   ;
+   return 0;
+ }
+@@ -23574,22 +24239,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_socket_connect=no
++	ac_cv_lib_socket_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+    fi
+ 
+-   echo "$as_me:$LINENO: checking for remove" >&5
+-echo $ECHO_N "checking for remove... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23616,30 +24282,24 @@
+ 
+ #undef remove
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char remove ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_remove) || defined (__stub___remove)
++#if defined __stub_remove || defined __stub___remove
+ choke me
+-#else
+-char (*f) () = remove;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != remove;
++return remove ();
+   ;
+   return 0;
+ }
+@@ -23671,17 +24331,18 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_remove=no
++	ac_cv_func_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-echo "${ECHO_T}$ac_cv_func_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+ 
+    if test $ac_cv_func_remove = no; then
+-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23694,17 +24355,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char remove ();
+ int
+ main ()
+ {
+-remove ();
++return remove ();
+   ;
+   return 0;
+ }
+@@ -23736,14 +24397,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_posix_remove=no
++	ac_cv_lib_posix_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -23751,8 +24413,8 @@
+    fi
+ 
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-   echo "$as_me:$LINENO: checking for shmat" >&5
+-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23779,30 +24441,24 @@
+ 
+ #undef shmat
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shmat ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shmat) || defined (__stub___shmat)
++#if defined __stub_shmat || defined __stub___shmat
+ choke me
+-#else
+-char (*f) () = shmat;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != shmat;
++return shmat ();
+   ;
+   return 0;
+ }
+@@ -23834,18 +24490,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_shmat=no
++	ac_cv_func_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-echo "${ECHO_T}$ac_cv_func_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+ if test $ac_cv_func_shmat = yes; then
+   :
+ else
+-  echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -23858,17 +24515,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shmat ();
+ int
+ main ()
+ {
+-shmat ();
++return shmat ();
+   ;
+   return 0;
+ }
+@@ -23900,14 +24557,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ipc_shmat=no
++	ac_cv_lib_ipc_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -23921,18 +24579,19 @@
+ for ac_header in sys/types.h stdint.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23969,15 +24628,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24011,9 +24671,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24037,25 +24698,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24073,18 +24728,19 @@
+ for ac_header in sys/bitypes.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24121,15 +24777,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24163,9 +24820,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24189,25 +24847,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24221,8 +24873,8 @@
+ 
+ 
+    # darwin requires a poll emulation library
+-   echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
+-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
++echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_poll_poll+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24235,17 +24887,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char poll ();
+ int
+ main ()
+ {
+-poll ();
++return poll ();
+   ;
+   return 0;
+ }
+@@ -24277,14 +24929,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_poll_poll=no
++	ac_cv_lib_poll_poll=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
+-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
++echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
+ if test $ac_cv_lib_poll_poll = yes; then
+   LIB_POLL="-lpoll"
+ fi
+@@ -24295,18 +24948,19 @@
+ for ac_header in Carbon/Carbon.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24343,15 +24997,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24385,9 +25040,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24411,25 +25067,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -24444,17 +25094,17 @@
+ 
+    # CoreAudio framework
+    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24491,15 +25141,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
++echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24533,9 +25184,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -24559,25 +25211,18 @@
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
++echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
++echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+@@ -24594,8 +25239,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
+-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
++echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
+   kde_libs_safe="$LIBS"
+   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -24644,8 +25289,8 @@
+   (exit $ac_status); }; }; then
+ 
+       LIBRESOLV="-lresolv"
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_RES_INIT 1
+@@ -24656,25 +25301,25 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	 { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   LIBS=$kde_libs_safe
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${kde_cv_func_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -24686,9 +25331,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16277,1410 +25818,8852 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24719,8 +24320,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=$?
-@@ -24824,8 +24424,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=$?
-@@ -24925,8 +24524,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=$?
-@@ -25000,8 +24598,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=$?
-@@ -25064,8 +24661,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=$?
-@@ -25127,8 +24723,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=$?
-@@ -25168,8 +24763,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=$?
-@@ -25225,8 +24819,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=$?
-@@ -25266,8 +24859,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=$?
-@@ -25331,8 +24923,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=$?
-@@ -25363,10 +24954,8 @@
+@@ -24740,8 +25382,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_res_init=no
++	kde_cv_func_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -24755,11 +25398,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
+-echo "${ECHO_T}$kde_cv_func_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
++echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
+-echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
++echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24780,8 +25423,7 @@
+ if test "x$kde_cv_proto_res_init" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -24846,9 +25488,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_res_init="res_init unavailable"
++	kde_cv_proto_res_init="res_init unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -24862,8 +25505,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
++echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
+ 
+ if test "x$kde_cv_func_res_init" = xyes; then
+ 
+@@ -24890,8 +25533,8 @@
+    LIBSOCKET="$X_EXTRA_LIBS"
+ 
+ 
+-   echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
+-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
++echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ucb_killpg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24904,17 +25547,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char killpg ();
+ int
+ main ()
+ {
+-killpg ();
++return killpg ();
+   ;
+   return 0;
+ }
+@@ -24946,27 +25589,28 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ucb_killpg=no
++	ac_cv_lib_ucb_killpg=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
+ if test $ac_cv_lib_ucb_killpg = yes; then
+   LIBUCB="-lucb"
+ fi
+ 
+ 
+    case $host in     *-*-lynxos* )
+-        echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
+-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
++echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
+         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
+-        echo "$as_me:$LINENO: result: disabled" >&5
+-echo "${ECHO_T}disabled" >&6
+-        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: result: disabled" >&5
++echo "${ECHO_T}disabled" >&6; }
++        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -24979,17 +25623,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char gethostbyname ();
+ int
+ main ()
+ {
+-gethostbyname ();
++return gethostbyname ();
+   ;
+   return 0;
+ }
+@@ -25021,22 +25665,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_bsd_gethostbyname=no
++	ac_cv_lib_bsd_gethostbyname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   LIBSOCKET="-lbsd"
+ fi
+           ;;
+     esac
+ 
+-     echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6; }
+ if test "${ac_cv_type_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25047,12 +25692,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef int ac__type_new_;
+ int
+ main ()
+ {
+-if ((int *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (int))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -25085,20 +25731,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_int=no
++	ac_cv_type_int=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_int" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25111,10 +25758,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25152,10 +25800,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25189,30 +25838,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25250,10 +25901,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25287,23 +25939,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25315,10 +25970,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef int ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25352,26 +26008,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25379,8 +26029,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++		   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25389,22 +26040,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (int))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -25428,28 +26079,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -25477,8 +25066,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=$?
-@@ -25540,8 +25128,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=$?
-@@ -25581,8 +25168,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=$?
-@@ -25638,8 +25224,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=$?
-@@ -25679,8 +25264,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=$?
-@@ -25744,8 +25328,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=$?
-@@ -25776,10 +25359,8 @@
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+-   echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6; }
+ if test "${ac_cv_type_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25460,12 +26110,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef short ac__type_new_;
+ int
+ main ()
+ {
+-if ((short *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (short))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -25498,20 +26149,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_short=no
++	ac_cv_type_short=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_short" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25524,10 +26176,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25565,10 +26218,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25602,30 +26256,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25663,10 +26319,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25700,23 +26357,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -25728,10 +26388,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef short ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25765,26 +26426,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25792,8 +26447,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++		   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25802,22 +26458,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (short))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -25841,28 +26497,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -25890,8 +25471,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=$?
-@@ -25953,8 +25533,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=$?
-@@ -25994,8 +25573,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=$?
-@@ -26051,8 +25629,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=$?
-@@ -26092,8 +25669,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=$?
-@@ -26157,8 +25733,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=$?
-@@ -26189,10 +25764,8 @@
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for long" >&5
++echo $ECHO_N "checking for long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -25873,12 +26528,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef long ac__type_new_;
+ int
+ main ()
+ {
+-if ((long *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (long))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -25911,20 +26567,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
++	ac_cv_type_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
++echo "${ECHO_T}$ac_cv_type_long" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of long" >&5
++echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -25937,10 +26594,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -25978,10 +26636,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26015,30 +26674,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26076,10 +26737,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26113,23 +26775,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26141,10 +26806,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26178,26 +26844,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26205,8 +26865,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++		   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26215,22 +26876,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -26254,28 +26915,27 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -26303,8 +25876,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=$?
-@@ -26366,8 +25938,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=$?
-@@ -26407,8 +25978,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=$?
-@@ -26464,8 +26034,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=$?
-@@ -26505,8 +26074,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=$?
-@@ -26570,8 +26138,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=$?
-@@ -26602,10 +26169,8 @@
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: checking for char *" >&5
+-echo $ECHO_N "checking for char *... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for char *" >&5
++echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26286,12 +26946,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef char * ac__type_new_;
+ int
+ main ()
+ {
+-if ((char * *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (char *))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -26324,20 +26985,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_char_p=no
++	ac_cv_type_char_p=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+-echo "${ECHO_T}$ac_cv_type_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
++echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of char *" >&5
+-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of char *" >&5
++echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char_p+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_char_p" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -26350,10 +27012,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26391,10 +27054,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26428,30 +27092,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26489,10 +27155,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26526,23 +27193,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -26554,10 +27224,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef char * ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26591,26 +27262,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26618,8 +27283,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char *)); }
+-unsigned long ulongval () { return (long) (sizeof (char *)); }
++		   typedef char * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26628,22 +27294,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (char *))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (char *))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -26667,30 +27333,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -26724,8 +26289,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=$?
-@@ -26796,8 +26360,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=$?
-@@ -26867,8 +26430,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=$?
-@@ -26930,8 +26492,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=$?
-@@ -26971,8 +26532,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=$?
-@@ -27028,8 +26588,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=$?
-@@ -27069,8 +26628,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=$?
-@@ -27134,8 +26692,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=$?
-@@ -27166,10 +26723,8 @@
+   ac_cv_sizeof_char_p=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26703,17 +27368,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+ int
+ main ()
+ {
+-dlopen ();
++return dlopen ();
+   ;
+   return 0;
+ }
+@@ -26745,14 +27410,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dl_dlopen=no
++	ac_cv_lib_dl_dlopen=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+ if test $ac_cv_lib_dl_dlopen = yes; then
+ 
+ LIBDL="-ldl"
+@@ -26761,8 +27427,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
++echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26775,17 +27441,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char shl_unload ();
+ int
+ main ()
+ {
+-shl_unload ();
++return shl_unload ();
+   ;
+   return 0;
+ }
+@@ -26817,14 +27483,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_dld_shl_unload=no
++	ac_cv_lib_dld_shl_unload=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
+ if test $ac_cv_lib_dld_shl_unload = yes; then
+ 
+ LIBDL="-ldld"
+@@ -26838,8 +27505,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26850,12 +27517,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef size_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((size_t *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (size_t))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -26888,20 +27556,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_size_t=no
++	ac_cv_type_size_t=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of size_t" >&5
+-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of size_t" >&5
++echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_size_t" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -26914,10 +27583,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26955,10 +27625,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -26992,30 +27663,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27053,10 +27726,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27090,23 +27764,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27118,10 +27795,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef size_t ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27155,26 +27833,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27182,8 +27854,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (size_t)); }
+-unsigned long ulongval () { return (long) (sizeof (size_t)); }
++		   typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27192,22 +27865,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (size_t))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (size_t))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -27231,29 +27904,28 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -27281,8 +26836,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=$?
-@@ -27344,8 +26898,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=$?
-@@ -27385,8 +26938,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=$?
-@@ -27442,8 +26994,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=$?
-@@ -27483,8 +27034,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=$?
-@@ -27548,8 +27098,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=$?
-@@ -27580,10 +27129,8 @@
+   ac_cv_sizeof_size_t=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+ 
+ 
+-  echo "$as_me:$LINENO: checking for unsigned long" >&5
+-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for unsigned long" >&5
++echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_type_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -27264,12 +27936,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++typedef unsigned long ac__type_new_;
+ int
+ main ()
+ {
+-if ((unsigned long *) 0)
++if ((ac__type_new_ *) 0)
+   return 0;
+-if (sizeof (unsigned long))
++if (sizeof (ac__type_new_))
+   return 0;
+   ;
+   return 0;
+@@ -27302,20 +27975,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_unsigned_long=no
++	ac_cv_type_unsigned_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of unsigned long" >&5
+-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
++echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_unsigned_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
++  # The cast to long int works around a bug in the HP C Compiler
+   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+   # This bug is HP SR number 8606223364.
+@@ -27328,10 +28002,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27369,10 +28044,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27406,30 +28082,32 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27467,10 +28145,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27504,23 +28183,26 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+@@ -27532,10 +28214,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   typedef unsigned long ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -27569,26 +28252,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-    { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27596,8 +28273,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (unsigned long)); }
+-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
++		   typedef unsigned long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27606,22 +28284,22 @@
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (unsigned long))) < 0)
++    return 1;
++  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%ld\n", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (unsigned long))))
+-	exit (1);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (ac__type_sizeof_))))
++	return 1;
+       fprintf (f, "%lu\n", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+@@ -27645,30 +28323,29 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
+   ac_cv_sizeof_unsigned_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
+-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
++echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27694,8 +27241,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
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27710,15 +28387,15 @@
    ac_status=$?
-@@ -27776,8 +27322,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=$?
-@@ -27877,8 +27422,7 @@
-   cat conftest.err >&5
+   (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       { { echo "$as_me:$LINENO: error:
+        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
+        does not apply. Please mail kde-devel at kde.org with a description of your system!
+@@ -27730,18 +28407,18 @@
+    { (exit 1); exit 1; }; }
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+-  echo "$as_me:$LINENO: checking for PIE support" >&5
+-echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for PIE support" >&5
++echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
+ if test "${kde_cv_val_pie_support+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -27797,8 +28474,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_pie_support=no
++	kde_cv_val_pie_support=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -27812,26 +28490,26 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
++echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
++echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
+ 
+-  # Check whether --enable-pie or --disable-pie was given.
++  # Check whether --enable-pie was given.
+ if test "${enable_pie+set}" = set; then
+-  enableval="$enable_pie"
+-  kde_has_pie_support=$enableval
++  enableval=$enable_pie; kde_has_pie_support=$enableval
+ else
+   kde_has_pie_support=detect
+-fi;
++fi
++
+ 
+   if test "$kde_has_pie_support" = "detect"; then
+     kde_has_pie_support=$kde_cv_val_pie_support
+   fi
+ 
+-  echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
+-echo "${ECHO_T}$kde_has_pie_support" >&6
++  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
++echo "${ECHO_T}$kde_has_pie_support" >&6; }
+ 
+   KDE_USE_FPIE=""
+   KDE_USE_PIE=""
+@@ -27850,18 +28528,19 @@
+ for ac_header in crt_externs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27898,15 +28577,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27940,9 +28620,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -27966,25 +28647,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -27996,8 +28671,8 @@
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
++echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28024,30 +28699,24 @@
+ 
+ #undef _NSGetEnviron
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char _NSGetEnviron ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
++#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
+ choke me
+-#else
+-char (*f) () = _NSGetEnviron;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != _NSGetEnviron;
++return _NSGetEnviron ();
+   ;
+   return 0;
+ }
+@@ -28079,13 +28748,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func__NSGetEnviron=no
++	ac_cv_func__NSGetEnviron=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
++echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
+ if test $ac_cv_func__NSGetEnviron = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -28106,9 +28776,9 @@
+ for ac_func in vsnprintf snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -28134,30 +28804,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -28189,13 +28853,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -28212,32 +28878,32 @@
+ 
+ 
+ 
+-# Check whether --enable-embedded or --disable-embedded was given.
++# Check whether --enable-embedded was given.
+ if test "${enable_embedded+set}" = set; then
+-  enableval="$enable_embedded"
+-  kde_use_qt_emb=$enableval
++  enableval=$enable_embedded; kde_use_qt_emb=$enableval
+ else
+   kde_use_qt_emb=no
+ 
+-fi;
++fi
++
+ 
+-# Check whether --enable-qtopia or --disable-qtopia was given.
++# Check whether --enable-qtopia was given.
+ if test "${enable_qtopia+set}" = set; then
+-  enableval="$enable_qtopia"
+-  kde_use_qt_emb_palm=$enableval
++  enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
+ else
+   kde_use_qt_emb_palm=no
+ 
+-fi;
++fi
+ 
+-# Check whether --enable-mac or --disable-mac was given.
++
++# Check whether --enable-mac was given.
+ if test "${enable_mac+set}" = set; then
+-  enableval="$enable_mac"
+-  kde_use_qt_mac=$enableval
++  enableval=$enable_mac; kde_use_qt_mac=$enableval
+ else
+   kde_use_qt_mac=no
+ 
+-fi;
++fi
++
+ 
+ # used to disable x11-specific stuff on special platforms
+ 
+@@ -28253,8 +28919,8 @@
+ 
+ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+ 
+-echo "$as_me:$LINENO: checking for X" >&5
+-echo $ECHO_N "checking for X... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+ 
+ if test "${kde_cv_have_x+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -28359,6 +29025,7 @@
+     fi
+   done
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
+ 
+@@ -28416,7 +29083,7 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-LIBS="$ac_save_LIBS"
++	LIBS="$ac_save_LIBS"
+ # First see if replacing the include by lib works.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
+@@ -28464,6 +29131,7 @@
+   done
+ done
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+@@ -28474,7 +29142,7 @@
+ *-*-solaris*)
+   ;;
+ *)
+-  rm -fr conftest.dir
++  rm -f -r conftest.dir
+ if mkdir conftest.dir; then
+   cd conftest.dir
+   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+@@ -28482,13 +29150,13 @@
+ acfindx:
+ 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+ _ACEOF
+-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+     eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+     for ac_extension in a so sl; do
+-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+-	 test -f $ac_im_libdir/libX11.$ac_extension; then
++      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
++	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ 	ac_im_usrlibdir=$ac_im_libdir; break
+       fi
+     done
+@@ -28496,7 +29164,7 @@
+     # bogus both because they are the default anyway, and because
+     # using them would break gcc on systems where it needs fixed includes.
+     case $ac_im_incroot in
+-	/usr/include) ;;
++	/usr/include) ac_x_includes= ;;
+ 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+     esac
+     case $ac_im_usrlibdir in
+@@ -28505,7 +29173,7 @@
+     esac
+   fi
+   cd ..
+-  rm -fr conftest.dir
++  rm -f -r conftest.dir
+ fi
+ 
+   if test -z "$ac_x_includes"; then
+@@ -28549,12 +29217,12 @@
+ eval "$kde_cv_have_x"
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:$LINENO: result: $have_x" >&5
+-echo "${ECHO_T}$have_x" >&6
++  { echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6; }
+   no_x=yes
+ else
+-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
+-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
++echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+ fi
+ 
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -28582,8 +29250,8 @@
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
+-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28596,17 +29264,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char IceConnectionNumber ();
+ int
+ main ()
+ {
+-IceConnectionNumber ();
++return IceConnectionNumber ();
+   ;
+   return 0;
+ }
+@@ -28638,14 +29306,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ICE_IceConnectionNumber=no
++	ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   LIBSM="-lSM -lICE"
+ fi
+@@ -28654,8 +29323,8 @@
+ 
+ LIB_X11='-lX11 $(LIBSOCKET)'
+ 
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libXext" >&5
++echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+ if test "${kde_cv_have_libXext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28715,9 +29384,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_have_libXext=no
++	kde_cv_have_libXext=no
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -28727,8 +29397,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
++echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
+ 
+ if test "$kde_cv_have_libXext" = "no"; then
+   { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -28874,8 +29544,8 @@
+     else
+       PTHREAD_LIBS_save="$PTHREAD_LIBS"
+       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+-      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
+ 
+      kde_save_LDFLAGS="$LDFLAGS"
+           kde_save_LIBS="$LIBS"
+@@ -28886,9 +29556,9 @@
+ 	;;
+      esac
+      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -28900,17 +29570,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+@@ -28942,14 +29612,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Lib=no"
++	eval "$as_ac_Lib=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -28962,8 +29634,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD"; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28976,17 +29648,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+@@ -29018,14 +29690,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pthread_pthread_create=no
++	ac_cv_lib_pthread_pthread_create=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+   LIBPTHREAD="-lpthread"
+ fi
+@@ -29033,8 +29706,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD" ; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+     kde_safe_libs=$LIBS
+     LIBS="$LIBS -lpthread"
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -29075,17 +29748,18 @@
    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=$?
-@@ -28058,8 +27602,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=$?
-@@ -28168,8 +27711,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=$?
-@@ -28393,8 +27935,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=$?
-@@ -28617,8 +28158,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=$?
-@@ -28694,8 +28234,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=$?
-@@ -28921,8 +28460,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=$?
-@@ -28997,8 +28535,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=$?
-@@ -29058,8 +28595,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=$?
-@@ -29142,8 +28678,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=$?
-@@ -29236,8 +28771,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=$?
-@@ -29411,8 +28945,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=$?
-@@ -29510,8 +29043,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=$?
-@@ -29598,8 +29130,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=$?
-@@ -29676,8 +29207,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=$?
-@@ -29730,7 +29260,7 @@
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         LIBPTHREAD="-lpthread"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS=$kde_safe_libs
+@@ -29101,16 +29775,15 @@
+       USE_THREADS=""
+       if test -z "$LIBPTHREAD"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
++echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -29163,7 +29836,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -29177,13 +29852,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-D_THREAD_SAFE -pthread"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29195,16 +29870,15 @@
+     case $host_os in
+  	solaris*)
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
+-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
++echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
+ kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   ac_ext=cc
++   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -29257,7 +29931,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -29271,13 +29947,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-mt"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29304,17 +29980,17 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for extra includes" >&5
+-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra includes" >&5
++echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
+ 
+-# Check whether --with-extra-includes or --without-extra-includes was given.
++# Check whether --with-extra-includes was given.
+ if test "${with_extra_includes+set}" = set; then
+-  withval="$with_extra_includes"
+-  kde_use_extra_includes="$withval"
++  withval=$with_extra_includes; kde_use_extra_includes="$withval"
+ else
+   kde_use_extra_includes=NONE
+ 
+-fi;
++fi
++
+ kde_extra_includes=
+ if test -n "$kde_use_extra_includes" && \
+    test "$kde_use_extra_includes" != "NONE"; then
+@@ -29332,21 +30008,21 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
+-echo "${ECHO_T}$kde_use_extra_includes" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
++echo "${ECHO_T}$kde_use_extra_includes" >&6; }
+ 
+ kde_extra_libs=
+-echo "$as_me:$LINENO: checking for extra libs" >&5
+-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for extra libs" >&5
++echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
+ 
+-# Check whether --with-extra-libs or --without-extra-libs was given.
++# Check whether --with-extra-libs was given.
+ if test "${with_extra_libs+set}" = set; then
+-  withval="$with_extra_libs"
+-  kde_use_extra_libs=$withval
++  withval=$with_extra_libs; kde_use_extra_libs=$withval
+ else
+   kde_use_extra_libs=NONE
+ 
+-fi;
++fi
++
+ if test -n "$kde_use_extra_libs" && \
+    test "$kde_use_extra_libs" != "NONE"; then
+ 
+@@ -29365,14 +30041,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
+-echo "${ECHO_T}$kde_use_extra_libs" >&6
++{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
++echo "${ECHO_T}$kde_use_extra_libs" >&6; }
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libz" >&5
+-echo $ECHO_N "checking for libz... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libz" >&5
++echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_z+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29432,8 +30108,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_z=no"
++	eval "ac_cv_lib_z=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29447,8 +30124,8 @@
+ _ACEOF
+ 
+   LIBZ="$ac_cv_lib_z"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+-echo "${ECHO_T}$ac_cv_lib_z" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
++echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: not found.
+           Possibly configure picks up an outdated version
+@@ -29468,8 +30145,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libpng" >&5
+-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libpng" >&5
++echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29531,9 +30208,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_png=no"
++	eval "ac_cv_lib_png=no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29548,19 +30226,19 @@
+ 
+   LIBPNG="$ac_cv_lib_png"
+ 
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
+-echo "${ECHO_T}$ac_cv_lib_png" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
++echo "${ECHO_T}$ac_cv_lib_png" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   LIBPNG=""
+ 
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
+-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
++echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_6b+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29619,8 +30297,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_6b=no"
++	eval "ac_cv_lib_jpeg_6b=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29631,14 +30310,14 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_6b"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for libjpeg" >&5
+-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libjpeg" >&5
++echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_jpeg_normal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -29697,8 +30376,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_jpeg_normal=no"
++	eval "ac_cv_lib_jpeg_normal=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29709,11 +30389,11 @@
+ 
+ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
+   LIBJPEG="$ac_cv_lib_jpeg_normal"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
+-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
++echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+        LIBJPEG=
+ 
+@@ -29733,7 +30413,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29733: $i/$j" >&5
-+    echo "configure: 29263: $i/$j" >&5
+-    echo "configure: 29736: $i/$j" >&5
++    echo "configure: 30416: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -30028,7 +29558,7 @@
+@@ -29780,14 +30460,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for perl" >&5
+-echo $ECHO_N "checking for perl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for perl" >&5
++echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
+    if test -n "$PERL"; then
+         kde_cv_path="$PERL";
+    else
+         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -29830,8 +30510,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+ 		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
+ We need perl to generate some code." >&5
+@@ -29840,8 +30520,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       PERL=$kde_cv_path
+ 
+    fi
+@@ -29855,10 +30535,9 @@
+ 
+ 
+ 
+-# Check whether --enable-mt or --disable-mt was given.
++# Check whether --enable-mt was given.
+ if test "${enable_mt+set}" = set; then
+-  enableval="$enable_mt"
+-  kde_use_qt_mt=$enableval
++  enableval=$enable_mt; kde_use_qt_mt=$enableval
+ else
+ 
+     if test $kde_qtver = 3; then
+@@ -29868,7 +30547,8 @@
+     fi
+ 
+ 
+-fi;
++fi
++
+ 
+ USING_QT_MT=""
+ 
+@@ -29888,13 +30568,13 @@
+   else
+     kde_check_threading_default=yes
+   fi
+-  # Check whether --enable-threading or --disable-threading was given.
++  # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
+-  enableval="$enable_threading"
+-  kde_use_threading=$enableval
++  enableval=$enable_threading; kde_use_threading=$enableval
+ else
+   kde_use_threading=$kde_check_threading_default
+-fi;
++fi
++
+   if test "x$kde_use_threading" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -29966,8 +30646,8 @@
+   LIBQT="$LIBQT $LIBDL"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for Qt" >&5
+-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt" >&5
++echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
+ 
+ if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+ LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
+@@ -29976,34 +30656,34 @@
+ qt_libraries=""
+ qt_includes=""
+ 
+-# Check whether --with-qt-dir or --without-qt-dir was given.
++# Check whether --with-qt-dir was given.
+ if test "${with_qt_dir+set}" = set; then
+-  withval="$with_qt_dir"
+-    ac_qt_includes="$withval"/include
++  withval=$with_qt_dir;   ac_qt_includes="$withval"/include
+        ac_qt_libraries="$withval"/lib${kdelibsuff}
+        ac_qt_bindir="$withval"/bin
+ 
+-fi;
++fi
+ 
+ 
+-# Check whether --with-qt-includes or --without-qt-includes was given.
+-if test "${with_qt_includes+set}" = set; then
+-  withval="$with_qt_includes"
+ 
++# Check whether --with-qt-includes was given.
++if test "${with_qt_includes+set}" = set; then
++  withval=$with_qt_includes;
+        ac_qt_includes="$withval"
+ 
+-fi;
++fi
++
+ 
+ kde_qt_libs_given=no
+ 
+ 
+-# Check whether --with-qt-libraries or --without-qt-libraries was given.
++# Check whether --with-qt-libraries was given.
+ if test "${with_qt_libraries+set}" = set; then
+-  withval="$with_qt_libraries"
+-    ac_qt_libraries="$withval"
++  withval=$with_qt_libraries;   ac_qt_libraries="$withval"
+        kde_qt_libs_given=yes
+ 
+-fi;
++fi
++
+ 
+ if test "${ac_cv_have_qt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -30031,7 +30711,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 30031: $i/$j" >&5
-+    echo "configure: 29561: $i/$j" >&5
+-    echo "configure: 30034: $i/$j" >&5
++    echo "configure: 30714: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30705,8 +30235,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=$?
-@@ -30865,7 +30394,7 @@
+@@ -30068,8 +30748,7 @@
+ ac_qt_libraries="$qt_libdir"
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30206,13 +30885,13 @@
+ eval "$ac_cv_have_qt"
+ 
+ if test "$have_qt" != yes; then
+-  echo "$as_me:$LINENO: result: $have_qt" >&5
+-echo "${ECHO_T}$have_qt" >&6;
++  { echo "$as_me:$LINENO: result: $have_qt" >&5
++echo "${ECHO_T}$have_qt" >&6; };
+ else
+   ac_cv_have_qt="have_qt=yes \
+     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
+-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
++echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
+ 
+   qt_libraries="$ac_qt_libraries"
+   qt_includes="$ac_qt_includes"
+@@ -30221,15 +30900,14 @@
+ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
+ 
+ 
+-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
+-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
++echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_direct+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30350,12 +31028,12 @@
+ 
+ 
+ if test "$kde_cv_qt_direct" = "yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   qt_libraries=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ fi
+ 
+@@ -30393,14 +31071,14 @@
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for moc" >&5
+-echo $ECHO_N "checking for moc... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for moc" >&5
++echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
+    if test -n "$MOC"; then
+         kde_cv_path="$MOC";
+    else
+         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30443,8 +31121,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
+ Please check whether you installed Qt correctly.
+@@ -30465,22 +31143,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MOC=$kde_cv_path
+ 
+    fi
+ 
+    if test -z "$UIC_NOT_NEEDED"; then
+ 
+-   echo "$as_me:$LINENO: checking for uic" >&5
+-echo $ECHO_N "checking for uic... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for uic" >&5
++echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
+    if test -n "$UIC_PATH"; then
+         kde_cv_path="$UIC_PATH";
+    else
+         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30523,12 +31201,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       UIC_PATH=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       UIC_PATH=$kde_cv_path
+ 
+    fi
+@@ -30558,10 +31236,10 @@
+ 
+        if test $kde_qtver = 3; then
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -L " >&5
+-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
++echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
+     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30584,22 +31262,22 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         :
+         ac_uic_supports_libpath=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         :
+         ac_uic_supports_libpath=no
+     fi
+ 
+ 
+-    echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
+-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
++echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
+     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
+-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
++    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -30622,13 +31300,13 @@
+ 
+ 
+     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         :
+         ac_uic_supports_nounload=yes
+     else
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         :
+         ac_uic_supports_nounload=no
+     fi
+@@ -30659,15 +31337,14 @@
+ 
+ 
+ if test -n "$LIBJPEG"; then
+-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
+-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
++echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
+ if test "${kde_cv_qt_jpeg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -30726,8 +31403,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "kde_cv_qt_jpeg=yes"
++	eval "kde_cv_qt_jpeg=yes"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -30744,12 +31422,12 @@
+ 
+ 
+ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   LIBJPEG_QT='$(LIBJPEG)'
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   LIBJPEG_QT=
+ fi
+ 
+@@ -30780,15 +31458,15 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for rpath" >&5
+-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
+-# Check whether --enable-rpath or --disable-rpath was given.
++{ echo "$as_me:$LINENO: checking for rpath" >&5
++echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
++# Check whether --enable-rpath was given.
+ if test "${enable_rpath+set}" = set; then
+-  enableval="$enable_rpath"
+-  USE_RPATH=$enableval
++  enableval=$enable_rpath; USE_RPATH=$enableval
+ else
+   USE_RPATH=yes
+-fi;
++fi
++
+ 
+ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
+ 
+@@ -30812,11 +31490,11 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
+-echo "${ECHO_T}$USE_RPATH" >&6
++{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
++echo "${ECHO_T}$USE_RPATH" >&6; }
+ 
+-echo "$as_me:$LINENO: checking for KDE" >&5
+-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE" >&5
++echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
+ 
+ if test "${prefix}" != NONE; then
+   kde_includes=${includedir}
+@@ -30868,7 +31546,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30868: $i/$j" >&5
-+    echo "configure: 30397: $i/$j" >&5
+-    echo "configure: 30871: $i/$j" >&5
++    echo "configure: 31549: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30895,7 +30424,7 @@
+@@ -30898,7 +31576,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30898: $i/$j" >&5
-+    echo "configure: 30427: $i/$j" >&5
+-    echo "configure: 30901: $i/$j" >&5
++    echo "configure: 31579: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30913,7 +30442,7 @@
+@@ -30916,7 +31594,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30916: $i/$j" >&5
-+    echo "configure: 30445: $i/$j" >&5
+-    echo "configure: 30919: $i/$j" >&5
++    echo "configure: 31597: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32436,7 +31965,7 @@
- do
-   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
-   do
--    echo "configure: 32439: $i/$j" >&5
-+    echo "configure: 31968: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       KDE_XSL_STYLESHEET=$i
-@@ -32634,8 +32163,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
+@@ -30975,12 +31653,12 @@
+  fi
+  if test "$exec_prefix" = NONE; then
+   ac_kde_exec_prefix="$ac_kde_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
++  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
+  else
+   ac_kde_exec_prefix="$exec_prefix"
+-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
+-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
++  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
++echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
+  fi
+ 
+  kde_libraries="${libdir}"
+@@ -30989,8 +31667,8 @@
+ else
+   ac_cv_have_kde="have_kde=yes \
+     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
+-  echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
+-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
++echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
+ 
+   kde_libraries="$ac_kde_libraries"
+   kde_includes="$ac_kde_includes"
+@@ -31028,8 +31706,8 @@
+ 
+ if test x$ac_uic_supports_libpath = xyes; then
+ 
+-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
+-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
++echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
+ if test "${kde_cv_uic_plugins+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -31072,8 +31750,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
+-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
++echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
+ if test "$kde_cv_uic_plugins" != yes; then
+ 	{ { echo "$as_me:$LINENO: error:
+ you need to install kdelibs first.
+@@ -31105,10 +31783,9 @@
+ 
+ 
+ 
+-  # Check whether --enable-path-check or --disable-path-check was given.
++  # Check whether --enable-path-check was given.
+ if test "${enable_path_check+set}" = set; then
+-  enableval="$enable_path_check"
+-
++  enableval=$enable_path_check;
+   if test "$enableval" = "no";
+     then ac_use_path_checking="default"
+     else ac_use_path_checking=""
+@@ -31122,13 +31799,14 @@
+   fi
+ 
+ 
+-fi;
++fi
+ 
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for KDE paths" >&5
+-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
++
++{ echo "$as_me:$LINENO: checking for KDE paths" >&5
++echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
+ kde_result=""
+ kde_cached_paths=yes
+ if test "${kde_cv_all_paths+set}" = set; then
+@@ -31239,15 +31917,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
+-
++     { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+ 
++    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+ 
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -31299,8 +31976,8 @@
    ac_status=$?
-@@ -32707,8 +32235,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
+   (exit $ac_status); }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  else
+    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31339,8 +32016,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ 
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31348,8 +32025,8 @@
    ac_status=$?
-@@ -32762,8 +32289,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
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31542,15 +32219,14 @@
+ else
+ 
+   if test $kde_qtver = 1; then
+-     echo "$as_me:$LINENO: result: compiling" >&5
+-echo "${ECHO_T}compiling" >&6
++     { echo "$as_me:$LINENO: result: compiling" >&5
++echo "${ECHO_T}compiling" >&6; }
+ 
+ 
+-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
+-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
++echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -31602,8 +32278,8 @@
    ac_status=$?
-@@ -32834,8 +32360,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
+   (exit $ac_status); }; then
+-   echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++   { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  else
+    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
+ Check, if you installed the KDE header files correctly.
+@@ -31642,8 +32318,8 @@
+      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
+-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
++echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
+ ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ 
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -31651,8 +32327,8 @@
    ac_status=$?
-@@ -32889,8 +32414,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (exit $ac_status); } && test -s conftest; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
+ Check, if your compiler is installed correctly and if you have used the
+@@ -31744,22 +32420,22 @@
+    { (exit 1); exit 1; }; }
+ else
+   rm -f conftest*
+-  echo "$as_me:$LINENO: result: $kde_result" >&5
+-echo "${ECHO_T}$kde_result" >&6
++  { echo "$as_me:$LINENO: result: $kde_result" >&5
++echo "${ECHO_T}$kde_result" >&6; }
+ fi
+ 
+ bindir=$kde_bindir
+ 
+ 
+ 
+-# Check whether --with-arts or --without-arts was given.
++# Check whether --with-arts was given.
+ if test "${with_arts+set}" = set; then
+-  withval="$with_arts"
+-  build_arts=$withval
++  withval=$with_arts; build_arts=$withval
+ else
+   build_arts=yes
+ 
+-fi;
++fi
++
+ 
+ 
+ if test "$build_arts" '!=' "no"; then
+@@ -31792,14 +32468,14 @@
+ 
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl" >&5
+-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidl" >&5
++echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
+    if test -n "$DCOPIDL"; then
+         kde_cv_path="$DCOPIDL";
+    else
+         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31842,8 +32518,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
+ Please check whether you installed KDE correctly.
+@@ -31854,21 +32530,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
+-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
++echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
+    if test -n "$DCOPIDL2CPP"; then
+         kde_cv_path="$DCOPIDL2CPP";
+    else
+         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31911,8 +32587,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
+ Please check whether you installed KDE correctly.
+@@ -31923,22 +32599,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDL2CPP=$kde_cv_path
+ 
+    fi
+ 
+         if test "$build_arts" '!=' "no"; then
+ 
+-   echo "$as_me:$LINENO: checking for mcopidl" >&5
+-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for mcopidl" >&5
++echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
+    if test -n "$MCOPIDL"; then
+         kde_cv_path="$MCOPIDL";
+    else
+         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -31981,8 +32657,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+ Please check whether you installed aRts correctly or use
+@@ -31995,21 +32671,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MCOPIDL=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for artsc-config" >&5
++echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
+    if test -n "$ARTSCCONFIG"; then
+         kde_cv_path="$ARTSCCONFIG";
+    else
+         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32052,8 +32728,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+ Please check whether you installed aRts correctly or use
+@@ -32066,22 +32742,22 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       ARTSCCONFIG=$kde_cv_path
+ 
+    fi
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for meinproc" >&5
+-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for meinproc" >&5
++echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
+    if test -n "$MEINPROC"; then
+         kde_cv_path="$MEINPROC";
+    else
+         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32124,12 +32800,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MEINPROC=$kde_cv_path
+ 
+    fi
+@@ -32158,14 +32834,14 @@
+ 
+         if test -n "$kde32ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
+-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
++echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+    if test -n "$KCONFIG_COMPILER"; then
+         kde_cv_path="$KCONFIG_COMPILER";
+    else
+         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32208,8 +32884,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+ Please check whether you installed KDE correctly.
+@@ -32220,21 +32896,21 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       KCONFIG_COMPILER=$kde_cv_path
+ 
+    fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dcopidlng" >&5
+-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
++echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
+    if test -n "$DCOPIDLNG"; then
+         kde_cv_path="$DCOPIDLNG";
+    else
+         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32277,8 +32953,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
+ Please check whether you installed KDE correctly.
+@@ -32289,8 +32965,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       DCOPIDLNG=$kde_cv_path
+ 
+    fi
+@@ -32298,14 +32974,14 @@
+         fi
+         if test -n "$kde33ornewer"; then
+ 
+-   echo "$as_me:$LINENO: checking for makekdewidgets" >&5
+-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
++echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
+    if test -n "$MAKEKDEWIDGETS"; then
+         kde_cv_path="$MAKEKDEWIDGETS";
+    else
+         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32348,8 +33024,8 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+     { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+ Please check whether you installed KDE correctly.
+@@ -32360,8 +33036,8 @@
+    { (exit 1); exit 1; }; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       MAKEKDEWIDGETS=$kde_cv_path
+ 
+    fi
+@@ -32369,14 +33045,14 @@
+ 
+         fi
+ 
+-   echo "$as_me:$LINENO: checking for xmllint" >&5
+-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for xmllint" >&5
++echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
+    if test -n "$XMLLINT"; then
+         kde_cv_path="$XMLLINT";
+    else
+         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -32419,12 +33095,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       XMLLINT=""
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       XMLLINT=$kde_cv_path
+ 
+    fi
+@@ -32439,7 +33115,7 @@
+ do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 32442: $i/$j" >&5
++    echo "configure: 33118: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -32595,170 +33271,42 @@
+ 
+ 
+ 
+-#MIN_CONFIG
+-
+-
+-
+-
+-
+-
+-ac_header_dirent=no
+-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <$ac_hdr>
+-
+-int
+-main ()
+-{
+-if ((DIR *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { 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=$?
-@@ -32957,8 +32481,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  eval "$as_ac_Header=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Header=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+-_ACEOF
+-
+-ac_header_dirent=$ac_hdr; break
+-fi
+-
+-done
+-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+-if test $ac_header_dirent = dirent.h; then
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { 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
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="none required"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in dir; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
++#MIN_CONFIG
++
++
++
++
++
++
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <$ac_hdr>
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++if ((DIR *) 0)
++return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -33142,8 +32665,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
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -32772,40 +33320,42 @@
    ac_status=$?
-@@ -33293,8 +32815,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'
+   (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -s conftest.$ac_objext'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33480,8 +33001,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
+   (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
++  eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++	eval "$as_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
+-fi
+-LIBS=$ac_func_search_save_LIBS
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++_ACEOF
+ 
++ac_header_dirent=$ac_hdr; break
+ fi
+ 
+-else
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -32813,22 +33363,29 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' dir; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
    ac_status=$?
-@@ -33601,8 +33121,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
+@@ -32850,40 +33407,73 @@
    ac_status=$?
-@@ -33671,8 +33190,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
+   (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="none required"
++  ac_cv_search_opendir=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in x; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
++      conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then
++  break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++  :
++else
++  ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++else
++  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' x; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
    ac_status=$?
-@@ -33760,8 +33278,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
+@@ -32905,30 +33495,40 @@
    ac_status=$?
-@@ -33853,8 +33370,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
+   (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
++  ac_cv_search_opendir=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
++      conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then
++  break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++  :
++else
++  ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+ fi
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32978,8 +33578,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
++	ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+@@ -33036,6 +33637,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -33055,8 +33657,8 @@
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -33079,12 +33681,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -33115,18 +33719,19 @@
+ for ac_header in fcntl.h sys/time.h unistd.h features.h alloca.h linux/awe_voice.h awe_voice.h /usr/src/sys/i386/isa/sound/awe_voice.h /usr/src/sys/gnu/i386/isa/sound/awe_voice.h linux/ucdrom.h sys/stdtypes.h sys/filio.h sys/audioio.h Alib.h sys/sem.h string.h getopt.h machine/endian.h sys/awe_voice.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33163,15 +33768,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33205,9 +33811,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33231,25 +33838,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33266,18 +33867,19 @@
+ for ac_header in linux/cdrom.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33314,15 +33916,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33356,9 +33959,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -33382,25 +33986,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -33418,9 +34016,9 @@
+ for ac_func in usleep snprintf
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -33446,30 +34044,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -33501,13 +34093,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -33517,8 +34111,8 @@
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking machine architecture" >&5
+-echo $ECHO_N "checking machine architecture... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking machine architecture" >&5
++echo $ECHO_N "checking machine architecture... $ECHO_C" >&6; }
+ 
+ ARCH_TYPE=`uname -m`
+ if test `uname -s` = "FreeBSD"
+@@ -33531,13 +34125,13 @@
+ 		;;
+ 	esac
+ fi;
+-echo "$as_me:$LINENO: result: $ARCH_TYPE" >&5
+-echo "${ECHO_T}$ARCH_TYPE" >&6
++{ echo "$as_me:$LINENO: result: $ARCH_TYPE" >&5
++echo "${ECHO_T}$ARCH_TYPE" >&6; }
+ 
+ case "$ARCH_TYPE" in
+ i?86)
+-	echo "$as_me:$LINENO: checking for a binutils new enough to support MMX" >&5
+-echo $ECHO_N "checking for a binutils new enough to support MMX... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking for a binutils new enough to support MMX" >&5
++echo $ECHO_N "checking for a binutils new enough to support MMX... $ECHO_C" >&6; }
+ 	as_ver=`echo|as -v 2>&1|grep ".*version.*"`
+ 	if test -z "$as_ver"
+ 	then
+@@ -33563,16 +34157,16 @@
+ 			fi
+ 		fi
+ 	fi
+-	echo "$as_me:$LINENO: result: $MMX_SUPPORT" >&5
+-echo "${ECHO_T}$MMX_SUPPORT" >&6
++	{ echo "$as_me:$LINENO: result: $MMX_SUPPORT" >&5
++echo "${ECHO_T}$MMX_SUPPORT" >&6; }
+ 	;;
+ *)
+ 		MMX_SUPPORT="no"
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33622,12 +34216,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_time=no
++	ac_cv_header_time=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -33638,8 +34233,8 @@
+ 
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+ 
+-echo "$as_me:$LINENO: checking for x86 SSE instructions" >&5
+-echo $ECHO_N "checking for x86 SSE instructions... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for x86 SSE instructions" >&5
++echo $ECHO_N "checking for x86 SSE instructions... $ECHO_C" >&6; }
+ if test "${ac_cv_x86_sse+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33692,14 +34287,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_x86_sse=no
++	ac_cv_x86_sse=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $ac_cv_x86_sse" >&5
+-echo "${ECHO_T}$ac_cv_x86_sse" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_x86_sse" >&5
++echo "${ECHO_T}$ac_cv_x86_sse" >&6; }
+ if test "x$ac_cv_x86_sse" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -33724,8 +34320,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33737,19 +34333,11 @@
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <signal.h>
+-#ifdef signal
+-# undef signal
+-#endif
+-#ifdef __cplusplus
+-extern "C" void (*signal (int, void (*)(int)))(int);
+-#else
+-void (*signal ()) ();
+-#endif
+ 
+ int
+ main ()
+ {
+-int i;
++return *(signal (0, 0)) (0) == 1;
+   ;
+   return 0;
+ }
+@@ -33776,17 +34364,18 @@
    ac_status=$?
-@@ -33933,8 +33449,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=$?
-@@ -34103,8 +33618,7 @@
-   cat conftest.err >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_type_signal=void
++  ac_cv_type_signal=int
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_signal=int
++	ac_cv_type_signal=void
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+-echo "${ECHO_T}$ac_cv_type_signal" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
++echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define RETSIGTYPE $ac_cv_type_signal
+@@ -33795,13 +34384,13 @@
+ 
+ 
+ 
+-# Check whether --with-vorbis or --without-vorbis was given.
++# Check whether --with-vorbis was given.
+ if test "${with_vorbis+set}" = set; then
+-  withval="$with_vorbis"
+-
++  withval=$with_vorbis;
+ else
+   with_vorbis=check
+-fi;
++fi
++
+ 
+ have_oggvorbis=no
+ if test "x$with_vorbis" != xno; then
+@@ -33818,8 +34407,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for ogg_page_version in -logg" >&5
+-echo $ECHO_N "checking for ogg_page_version in -logg... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for ogg_page_version in -logg" >&5
++echo $ECHO_N "checking for ogg_page_version in -logg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ogg_ogg_page_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33832,17 +34421,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char ogg_page_version ();
+ int
+ main ()
+ {
+-ogg_page_version ();
++return ogg_page_version ();
+   ;
+   return 0;
+ }
+@@ -33874,14 +34463,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ogg_ogg_page_version=no
++	ac_cv_lib_ogg_ogg_page_version=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ogg_ogg_page_version" >&5
+-echo "${ECHO_T}$ac_cv_lib_ogg_ogg_page_version" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ogg_ogg_page_version" >&5
++echo "${ECHO_T}$ac_cv_lib_ogg_ogg_page_version" >&6; }
+ if test $ac_cv_lib_ogg_ogg_page_version = yes; then
+   :
+ else
+@@ -33896,8 +34486,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -33907,17 +34496,17 @@
+ 
+ 
+    if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
+-echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
++echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
++echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking vorbis/vorbisfile.h usability" >&5
+-echo $ECHO_N "checking vorbis/vorbisfile.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking vorbis/vorbisfile.h usability" >&5
++echo $ECHO_N "checking vorbis/vorbisfile.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33954,15 +34543,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking vorbis/vorbisfile.h presence" >&5
+-echo $ECHO_N "checking vorbis/vorbisfile.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking vorbis/vorbisfile.h presence" >&5
++echo $ECHO_N "checking vorbis/vorbisfile.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33996,9 +34586,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -34022,25 +34613,18 @@
+ echo "$as_me: WARNING: vorbis/vorbisfile.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: vorbis/vorbisfile.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
+-echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for vorbis/vorbisfile.h" >&5
++echo $ECHO_N "checking for vorbis/vorbisfile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_vorbis_vorbisfile_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_vorbis_vorbisfile_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_vorbis_vorbisfile_h" >&5
++echo "${ECHO_T}$ac_cv_header_vorbis_vorbisfile_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
+@@ -34068,8 +34652,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for vorbis_info_init in -lvorbis" >&5
+-echo $ECHO_N "checking for vorbis_info_init in -lvorbis... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for vorbis_info_init in -lvorbis" >&5
++echo $ECHO_N "checking for vorbis_info_init in -lvorbis... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34082,17 +34666,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char vorbis_info_init ();
+ int
+ main ()
+ {
+-vorbis_info_init ();
++return vorbis_info_init ();
+   ;
+   return 0;
+ }
+@@ -34124,14 +34708,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_vorbis_vorbis_info_init=no
++	ac_cv_lib_vorbis_vorbis_info_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_info_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
++echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_info_init" >&6; }
+ if test $ac_cv_lib_vorbis_vorbis_info_init = yes; then
+   :
+ else
+@@ -34151,8 +34736,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for ov_open in -lvorbisfile" >&5
+-echo $ECHO_N "checking for ov_open in -lvorbisfile... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for ov_open in -lvorbisfile" >&5
++echo $ECHO_N "checking for ov_open in -lvorbisfile... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_vorbisfile_ov_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34165,17 +34750,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char ov_open ();
+ int
+ main ()
+ {
+-ov_open ();
++return ov_open ();
+   ;
+   return 0;
+ }
+@@ -34207,14 +34792,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_vorbisfile_ov_open=no
++	ac_cv_lib_vorbisfile_ov_open=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_ov_open" >&5
+-echo "${ECHO_T}$ac_cv_lib_vorbisfile_ov_open" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisfile_ov_open" >&5
++echo "${ECHO_T}$ac_cv_lib_vorbisfile_ov_open" >&6; }
+ if test $ac_cv_lib_vorbisfile_ov_open = yes; then
+   :
+ else
+@@ -34234,8 +34820,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for vorbis_encode_init in -lvorbisenc" >&5
+-echo $ECHO_N "checking for vorbis_encode_init in -lvorbisenc... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for vorbis_encode_init in -lvorbisenc" >&5
++echo $ECHO_N "checking for vorbis_encode_init in -lvorbisenc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_vorbisenc_vorbis_encode_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34248,17 +34834,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char vorbis_encode_init ();
+ int
+ main ()
+ {
+-vorbis_encode_init ();
++return vorbis_encode_init ();
+   ;
+   return 0;
+ }
+@@ -34290,14 +34876,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_vorbisenc_vorbis_encode_init=no
++	ac_cv_lib_vorbisenc_vorbis_encode_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisenc_vorbis_encode_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_vorbisenc_vorbis_encode_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisenc_vorbis_encode_init" >&5
++echo "${ECHO_T}$ac_cv_lib_vorbisenc_vorbis_encode_init" >&6; }
+ if test $ac_cv_lib_vorbisenc_vorbis_encode_init = yes; then
+   :
+ else
+@@ -34317,8 +34904,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbis" >&5
+-echo $ECHO_N "checking for vorbis_bitrate_addblock in -lvorbis... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for vorbis_bitrate_addblock in -lvorbis" >&5
++echo $ECHO_N "checking for vorbis_bitrate_addblock in -lvorbis... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_vorbis_vorbis_bitrate_addblock+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34331,17 +34918,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char vorbis_bitrate_addblock ();
+ int
+ main ()
+ {
+-vorbis_bitrate_addblock ();
++return vorbis_bitrate_addblock ();
+   ;
+   return 0;
+ }
+@@ -34373,14 +34960,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_vorbis_vorbis_bitrate_addblock=no
++	ac_cv_lib_vorbis_vorbis_bitrate_addblock=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_bitrate_addblock" >&5
+-echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_bitrate_addblock" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_bitrate_addblock" >&5
++echo "${ECHO_T}$ac_cv_lib_vorbis_vorbis_bitrate_addblock" >&6; }
+ if test $ac_cv_lib_vorbis_vorbis_bitrate_addblock = yes; then
+   have_vorbis_value=2
+ else
+@@ -34449,13 +35037,13 @@
+ fi
+ 
+ 
+-# Check whether --with-ossaudio or --without-ossaudio was given.
++# Check whether --with-ossaudio was given.
+ if test "${with_ossaudio+set}" = set; then
+-  withval="$with_ossaudio"
+-
++  withval=$with_ossaudio;
+ else
+   with_ossaudio=check
+-fi;
++fi
++
+ 
+ if test "x$with_ossaudio" != xno; then
+ 
+@@ -34466,18 +35054,19 @@
+ for ac_header in soundcard.h sys/soundcard.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34514,15 +35103,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34556,9 +35146,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -34582,25 +35173,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -34613,8 +35198,8 @@
+ done
+ 
+ 
+-  echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
+-echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
++echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34627,17 +35212,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char _oss_ioctl ();
+ int
+ main ()
+ {
+-_oss_ioctl ();
++return _oss_ioctl ();
+   ;
+   return 0;
+ }
+@@ -34669,14 +35254,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ossaudio__oss_ioctl=no
++	ac_cv_lib_ossaudio__oss_ioctl=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+-echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
++echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
+ if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
+   :
+ else
+@@ -34700,13 +35286,13 @@
+ fi
+ 
+ 
+-# Check whether --with-alsa or --without-alsa was given.
++# Check whether --with-alsa was given.
+ if test "${with_alsa+set}" = set; then
+-  withval="$with_alsa"
+-
++  withval=$with_alsa;
+ else
+   with_alsa=check
+-fi;
++fi
++
+ 
+ have_alsa=no
+ if test "x$with_alsa" != xno; then
+@@ -34718,18 +35304,19 @@
+ for ac_header in sys/asoundlib.h alsa/asoundlib.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34766,15 +35353,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34808,9 +35396,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -34834,25 +35423,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -34865,8 +35448,8 @@
+ done
+ 
+ 
+-  echo "$as_me:$LINENO: checking for snd_seq_create_simple_port in -lasound" >&5
+-echo $ECHO_N "checking for snd_seq_create_simple_port in -lasound... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for snd_seq_create_simple_port in -lasound" >&5
++echo $ECHO_N "checking for snd_seq_create_simple_port in -lasound... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34879,17 +35462,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char snd_seq_create_simple_port ();
+ int
+ main ()
+ {
+-snd_seq_create_simple_port ();
++return snd_seq_create_simple_port ();
+   ;
+   return 0;
+ }
+@@ -34921,14 +35504,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_asound_snd_seq_create_simple_port=no
++	ac_cv_lib_asound_snd_seq_create_simple_port=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_seq_create_simple_port" >&5
+-echo "${ECHO_T}$ac_cv_lib_asound_snd_seq_create_simple_port" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_seq_create_simple_port" >&5
++echo "${ECHO_T}$ac_cv_lib_asound_snd_seq_create_simple_port" >&6; }
+ if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
+   :
+ else
+@@ -34937,7 +35521,6 @@
+ 
+ 
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -35001,7 +35584,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35060,7 +35645,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -35119,7 +35706,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   fi
+   ac_ext=c
+@@ -35169,13 +35758,13 @@
+ fi
+ 
+ 
+-# Check whether --with-cdparanoia or --without-cdparanoia was given.
++# Check whether --with-cdparanoia was given.
+ if test "${with_cdparanoia+set}" = set; then
+-  withval="$with_cdparanoia"
+-
++  withval=$with_cdparanoia;
+ else
+   with_cdparanoia=check
+-fi;
++fi
++
+ 
+ have_cdparanoia=no
+ if test "x$with_cdparanoia" != xno; then
+@@ -35184,14 +35773,14 @@
+ 
+   if test -z "$CDPARANOIA"; then
+ 
+-   echo "$as_me:$LINENO: checking for cdparanoia" >&5
+-echo $ECHO_N "checking for cdparanoia... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for cdparanoia" >&5
++echo $ECHO_N "checking for cdparanoia... $ECHO_C" >&6; }
+    if test -n "$CDPARANOIA"; then
+         kde_cv_path="$CDPARANOIA";
+    else
+         kde_cache=`echo cdparanoia | sed 'y%./+-%__p_%'`
+ 
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+@@ -35234,12 +35823,12 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+ 
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       CDPARANOIA=$kde_cv_path
+ 
+    fi
+@@ -35254,8 +35843,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35265,17 +35853,17 @@
+ 
+ 
+    if test "${ac_cv_header_cdda_interface_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for cdda_interface.h" >&5
+-echo $ECHO_N "checking for cdda_interface.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for cdda_interface.h" >&5
++echo $ECHO_N "checking for cdda_interface.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_cdda_interface_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_cdda_interface_h" >&5
+-echo "${ECHO_T}$ac_cv_header_cdda_interface_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_cdda_interface_h" >&5
++echo "${ECHO_T}$ac_cv_header_cdda_interface_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking cdda_interface.h usability" >&5
+-echo $ECHO_N "checking cdda_interface.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking cdda_interface.h usability" >&5
++echo $ECHO_N "checking cdda_interface.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35312,15 +35900,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking cdda_interface.h presence" >&5
+-echo $ECHO_N "checking cdda_interface.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking cdda_interface.h presence" >&5
++echo $ECHO_N "checking cdda_interface.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35354,9 +35943,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -35380,25 +35970,18 @@
+ echo "$as_me: WARNING: cdda_interface.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: cdda_interface.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: cdda_interface.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for cdda_interface.h" >&5
+-echo $ECHO_N "checking for cdda_interface.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for cdda_interface.h" >&5
++echo $ECHO_N "checking for cdda_interface.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_cdda_interface_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_cdda_interface_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_cdda_interface_h" >&5
+-echo "${ECHO_T}$ac_cv_header_cdda_interface_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_cdda_interface_h" >&5
++echo "${ECHO_T}$ac_cv_header_cdda_interface_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_cdda_interface_h = yes; then
+@@ -35418,12 +36001,11 @@
+ 
+ 
+   # Older versions of FreeBSD's cdparanoia lack cdrom_drive.cdda_device_name
+-  echo "$as_me:$LINENO: checking for cdrom_drive.cdda_device_name in cdda_interface.h" >&5
+-echo $ECHO_N "checking for cdrom_drive.cdda_device_name in cdda_interface.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for cdrom_drive.cdda_device_name in cdda_interface.h" >&5
++echo $ECHO_N "checking for cdrom_drive.cdda_device_name in cdda_interface.h... $ECHO_C" >&6; }
+   kde_save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -35473,19 +36055,20 @@
    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=$?
-@@ -34186,8 +33700,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=$?
-@@ -34269,8 +33782,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=$?
-@@ -34352,8 +33864,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=$?
-@@ -34493,8 +34004,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=$?
-@@ -34648,8 +34158,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=$?
-@@ -34745,8 +34254,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=$?
-@@ -34900,8 +34408,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=$?
-@@ -34980,8 +34487,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=$?
-@@ -35039,8 +34545,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=$?
-@@ -35098,8 +34603,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=$?
-@@ -35291,8 +34795,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=$?
-@@ -35456,8 +34959,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=$?
-@@ -35539,8 +35041,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=$?
-@@ -35583,7 +35084,7 @@
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         have_cdparanoia=no
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -35504,8 +36087,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for paranoia_init in -lcdda_paranoia" >&5
+-echo $ECHO_N "checking for paranoia_init in -lcdda_paranoia... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for paranoia_init in -lcdda_paranoia" >&5
++echo $ECHO_N "checking for paranoia_init in -lcdda_paranoia... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_cdda_paranoia_paranoia_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35518,17 +36101,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char paranoia_init ();
+ int
+ main ()
+ {
+-paranoia_init ();
++return paranoia_init ();
+   ;
+   return 0;
+ }
+@@ -35560,14 +36143,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_cdda_paranoia_paranoia_init=no
++	ac_cv_lib_cdda_paranoia_paranoia_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_cdda_paranoia_paranoia_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_cdda_paranoia_paranoia_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_cdda_paranoia_paranoia_init" >&5
++echo "${ECHO_T}$ac_cv_lib_cdda_paranoia_paranoia_init" >&6; }
+ if test $ac_cv_lib_cdda_paranoia_paranoia_init = yes; then
+   :
+ else
+@@ -35586,7 +36170,7 @@
  do
    for j in libcdda_paranoia.$ext;
    do
--    echo "configure: 35586: $i/$j" >&5
-+    echo "configure: 35087: $i/$j" >&5
+-    echo "configure: 35589: $i/$j" >&5
++    echo "configure: 36173: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        para_libdir=$i
-@@ -35722,8 +35223,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=$?
-@@ -35892,8 +35392,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=$?
-@@ -36069,8 +35568,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=$?
-@@ -36322,8 +35820,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=$?
-@@ -36404,8 +35901,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=$?
-@@ -36486,8 +35982,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=$?
-@@ -36568,8 +36063,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=$?
-@@ -36938,8 +36432,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=$?
-@@ -37100,8 +36593,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=$?
-@@ -37287,8 +36779,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=$?
-@@ -37454,8 +36945,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=$?
-@@ -37907,8 +37397,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=$?
-@@ -38078,8 +37567,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=$?
-@@ -38206,8 +37694,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=$?
-@@ -38362,8 +37849,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=$?
-@@ -38478,8 +37964,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=$?
-@@ -38634,8 +38119,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=$?
-@@ -38742,8 +38226,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=$?
-@@ -38906,8 +38389,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=$?
-@@ -38968,8 +38450,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=$?
-@@ -39029,8 +38510,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=$?
-@@ -39092,8 +38572,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=$?
-@@ -39154,8 +38633,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=$?
-@@ -39216,8 +38694,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=$?
-@@ -39349,8 +38826,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=$?
-@@ -39499,8 +38975,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=$?
-@@ -39556,8 +39031,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=$?
-@@ -39705,8 +39179,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=$?
-@@ -39807,8 +39280,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=$?
-@@ -39958,8 +39430,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=$?
-@@ -40111,8 +39582,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=$?
-@@ -40154,8 +39624,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=$?
-@@ -40212,8 +39681,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=$?
-@@ -40343,8 +39811,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=$?
-@@ -40422,8 +39889,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=$?
-@@ -40486,8 +39952,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=$?
-@@ -40550,8 +40015,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=$?
-@@ -40614,8 +40078,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=$?
-@@ -40669,14 +40132,6 @@
- echo "${ECHO_T}$OS_TYPE" >&6
+@@ -35668,13 +36252,13 @@
+ fi
  
+ 
+-# Check whether --with-lame or --without-lame was given.
++# Check whether --with-lame was given.
+ if test "${with_lame+set}" = set; then
+-  withval="$with_lame"
+-
++  withval=$with_lame;
+ else
+   with_lame=check
+-fi;
++fi
++
+ 
+ have_lame=no
+ if test "x$with_lame" != xno; then
+@@ -35685,8 +36269,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -35696,17 +36279,17 @@
+ 
+ 
+    if test "${ac_cv_header_lame_lame_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for lame/lame.h" >&5
+-echo $ECHO_N "checking for lame/lame.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for lame/lame.h" >&5
++echo $ECHO_N "checking for lame/lame.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lame_lame_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lame_lame_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lame_lame_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lame_lame_h" >&5
++echo "${ECHO_T}$ac_cv_header_lame_lame_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking lame/lame.h usability" >&5
+-echo $ECHO_N "checking lame/lame.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lame/lame.h usability" >&5
++echo $ECHO_N "checking lame/lame.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35743,15 +36326,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking lame/lame.h presence" >&5
+-echo $ECHO_N "checking lame/lame.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking lame/lame.h presence" >&5
++echo $ECHO_N "checking lame/lame.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -35785,9 +36369,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -35811,25 +36396,18 @@
+ echo "$as_me: WARNING: lame/lame.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: lame/lame.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: lame/lame.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for lame/lame.h" >&5
+-echo $ECHO_N "checking for lame/lame.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for lame/lame.h" >&5
++echo $ECHO_N "checking for lame/lame.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_lame_lame_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_lame_lame_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_lame_lame_h" >&5
+-echo "${ECHO_T}$ac_cv_header_lame_lame_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_lame_lame_h" >&5
++echo "${ECHO_T}$ac_cv_header_lame_lame_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_lame_lame_h = yes; then
+@@ -35857,8 +36435,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for lame_init in -lmp3lame" >&5
+-echo $ECHO_N "checking for lame_init in -lmp3lame... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for lame_init in -lmp3lame" >&5
++echo $ECHO_N "checking for lame_init in -lmp3lame... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mp3lame_lame_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35871,17 +36449,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char lame_init ();
+ int
+ main ()
+ {
+-lame_init ();
++return lame_init ();
+   ;
+   return 0;
+ }
+@@ -35913,14 +36491,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_mp3lame_lame_init=no
++	ac_cv_lib_mp3lame_lame_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_mp3lame_lame_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_mp3lame_lame_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mp3lame_lame_init" >&5
++echo "${ECHO_T}$ac_cv_lib_mp3lame_lame_init" >&6; }
+ if test $ac_cv_lib_mp3lame_lame_init = yes; then
+   :
+ else
+@@ -35959,13 +36538,13 @@
+ 
+ 
+ 
+-# Check whether --with-taglib or --without-taglib was given.
++# Check whether --with-taglib was given.
+ if test "${with_taglib+set}" = set; then
+-  withval="$with_taglib"
+-
++  withval=$with_taglib;
+ else
+   with_taglib=check
+-fi;
++fi
++
+ 
+ have_taglib=no
+ have_taglib_mpc=no
+@@ -35973,8 +36552,8 @@
+ 
+   # Extract the first word of "taglib-config", so it can be a program name with args.
+ set dummy taglib-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_TAGLIB_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35990,29 +36569,30 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_TAGLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_TAGLIB_CONFIG" && ac_cv_path_TAGLIB_CONFIG="no"
+   ;;
+ esac
+ fi
+ TAGLIB_CONFIG=$ac_cv_path_TAGLIB_CONFIG
+-
+ if test -n "$TAGLIB_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $TAGLIB_CONFIG" >&5
+-echo "${ECHO_T}$TAGLIB_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $TAGLIB_CONFIG" >&5
++echo "${ECHO_T}$TAGLIB_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+   if test "x$TAGLIB_CONFIG" != xno; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36032,8 +36612,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -36043,17 +36622,17 @@
+ 
+ 
+    if test "${ac_cv_header_taglib_mpcfile_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for taglib/mpcfile.h" >&5
+-echo $ECHO_N "checking for taglib/mpcfile.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for taglib/mpcfile.h" >&5
++echo $ECHO_N "checking for taglib/mpcfile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_taglib_mpcfile_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_taglib_mpcfile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_taglib_mpcfile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_taglib_mpcfile_h" >&5
++echo "${ECHO_T}$ac_cv_header_taglib_mpcfile_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking taglib/mpcfile.h usability" >&5
+-echo $ECHO_N "checking taglib/mpcfile.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking taglib/mpcfile.h usability" >&5
++echo $ECHO_N "checking taglib/mpcfile.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36090,15 +36669,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking taglib/mpcfile.h presence" >&5
+-echo $ECHO_N "checking taglib/mpcfile.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking taglib/mpcfile.h presence" >&5
++echo $ECHO_N "checking taglib/mpcfile.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36132,9 +36712,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -36158,25 +36739,18 @@
+ echo "$as_me: WARNING: taglib/mpcfile.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: taglib/mpcfile.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: taglib/mpcfile.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for taglib/mpcfile.h" >&5
+-echo $ECHO_N "checking for taglib/mpcfile.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for taglib/mpcfile.h" >&5
++echo $ECHO_N "checking for taglib/mpcfile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_taglib_mpcfile_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_taglib_mpcfile_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_taglib_mpcfile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_taglib_mpcfile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_taglib_mpcfile_h" >&5
++echo "${ECHO_T}$ac_cv_header_taglib_mpcfile_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_taglib_mpcfile_h = yes; then
+@@ -36207,21 +36781,21 @@
+ fi
+ 
+ 
+-# Check whether --with-akode or --without-akode was given.
++# Check whether --with-akode was given.
+ if test "${with_akode+set}" = set; then
+-  withval="$with_akode"
+-
++  withval=$with_akode;
+ else
+   with_akode=check
+-fi;
++fi
++
+ 
+ have_akode=no
+ if test "x$with_akode" != xno; then
+ 
+   # Extract the first word of "akode-config", so it can be a program name with args.
+ set dummy akode-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_AKODE_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36237,29 +36811,30 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_AKODE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_AKODE_CONFIG" && ac_cv_path_AKODE_CONFIG="no"
+   ;;
+ esac
+ fi
+ AKODE_CONFIG=$ac_cv_path_AKODE_CONFIG
+-
+ if test -n "$AKODE_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $AKODE_CONFIG" >&5
+-echo "${ECHO_T}$AKODE_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $AKODE_CONFIG" >&5
++echo "${ECHO_T}$AKODE_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+   if test "x$AKODE_CONFIG" != xno; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36287,8 +36862,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for mpeg_decoder in -lakode_mpeg_decoder" >&5
+-echo $ECHO_N "checking for mpeg_decoder in -lakode_mpeg_decoder... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for mpeg_decoder in -lakode_mpeg_decoder" >&5
++echo $ECHO_N "checking for mpeg_decoder in -lakode_mpeg_decoder... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_akode_mpeg_decoder_mpeg_decoder+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36301,17 +36876,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char mpeg_decoder ();
+ int
+ main ()
+ {
+-mpeg_decoder ();
++return mpeg_decoder ();
+   ;
+   return 0;
+ }
+@@ -36343,14 +36918,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_akode_mpeg_decoder_mpeg_decoder=no
++	ac_cv_lib_akode_mpeg_decoder_mpeg_decoder=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_akode_mpeg_decoder_mpeg_decoder" >&5
+-echo "${ECHO_T}$ac_cv_lib_akode_mpeg_decoder_mpeg_decoder" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_akode_mpeg_decoder_mpeg_decoder" >&5
++echo "${ECHO_T}$ac_cv_lib_akode_mpeg_decoder_mpeg_decoder" >&6; }
+ if test $ac_cv_lib_akode_mpeg_decoder_mpeg_decoder = yes; then
+   have_akode_mpeg=yes
+ else
+@@ -36369,8 +36945,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for mpc_decoder in -lakode_mpc_decoder" >&5
+-echo $ECHO_N "checking for mpc_decoder in -lakode_mpc_decoder... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for mpc_decoder in -lakode_mpc_decoder" >&5
++echo $ECHO_N "checking for mpc_decoder in -lakode_mpc_decoder... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_akode_mpc_decoder_mpc_decoder+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36383,17 +36959,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char mpc_decoder ();
+ int
+ main ()
+ {
+-mpc_decoder ();
++return mpc_decoder ();
+   ;
+   return 0;
+ }
+@@ -36425,14 +37001,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_akode_mpc_decoder_mpc_decoder=no
++	ac_cv_lib_akode_mpc_decoder_mpc_decoder=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_akode_mpc_decoder_mpc_decoder" >&5
+-echo "${ECHO_T}$ac_cv_lib_akode_mpc_decoder_mpc_decoder" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_akode_mpc_decoder_mpc_decoder" >&5
++echo "${ECHO_T}$ac_cv_lib_akode_mpc_decoder_mpc_decoder" >&6; }
+ if test $ac_cv_lib_akode_mpc_decoder_mpc_decoder = yes; then
+   have_akode_mpc=yes
+ else
+@@ -36451,8 +37028,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for xiph_decoder in -lakode_xiph_decoder" >&5
+-echo $ECHO_N "checking for xiph_decoder in -lakode_xiph_decoder... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for xiph_decoder in -lakode_xiph_decoder" >&5
++echo $ECHO_N "checking for xiph_decoder in -lakode_xiph_decoder... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_akode_xiph_decoder_xiph_decoder+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36465,17 +37042,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char xiph_decoder ();
+ int
+ main ()
+ {
+-xiph_decoder ();
++return xiph_decoder ();
+   ;
+   return 0;
+ }
+@@ -36507,14 +37084,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_akode_xiph_decoder_xiph_decoder=no
++	ac_cv_lib_akode_xiph_decoder_xiph_decoder=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_akode_xiph_decoder_xiph_decoder" >&5
+-echo "${ECHO_T}$ac_cv_lib_akode_xiph_decoder_xiph_decoder" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_akode_xiph_decoder_xiph_decoder" >&5
++echo "${ECHO_T}$ac_cv_lib_akode_xiph_decoder_xiph_decoder" >&6; }
+ if test $ac_cv_lib_akode_xiph_decoder_xiph_decoder = yes; then
+   have_akode_xiph=yes
+ else
+@@ -36533,8 +37111,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for ffmpeg_decoder in -lakode_ffmpeg_decoder" >&5
+-echo $ECHO_N "checking for ffmpeg_decoder in -lakode_ffmpeg_decoder... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for ffmpeg_decoder in -lakode_ffmpeg_decoder" >&5
++echo $ECHO_N "checking for ffmpeg_decoder in -lakode_ffmpeg_decoder... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36547,17 +37125,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char ffmpeg_decoder ();
+ int
+ main ()
+ {
+-ffmpeg_decoder ();
++return ffmpeg_decoder ();
+   ;
+   return 0;
+ }
+@@ -36589,14 +37167,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder=no
++	ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder" >&5
+-echo "${ECHO_T}$ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder" >&5
++echo "${ECHO_T}$ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder" >&6; }
+ if test $ac_cv_lib_akode_ffmpeg_decoder_ffmpeg_decoder = yes; then
+   have_akode_ffmpeg=yes
+ else
+@@ -36660,8 +37239,8 @@
+ artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+ # Extract the first word of "artsc-config", so it can be a program name with args.
+ set dummy artsc-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36676,29 +37255,30 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no"
+   ;;
+ esac
+ fi
+ ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
+-
+ if test -n "$ARTSCCONFIG"; then
+-  echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
+-echo "${ECHO_T}$ARTSCCONFIG" >&6
++  { echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
++echo "${ECHO_T}$ARTSCCONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
+ 	LIB_ARTS="-lartskde"
+ 	ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
+@@ -36737,8 +37317,8 @@
+     artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+   # Extract the first word of "artsc-config", so it can be a program name with args.
+ set dummy artsc-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_kde_artsplug_compiles+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36753,29 +37333,30 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_kde_artsplug_compiles="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_kde_artsplug_compiles" && ac_cv_path_kde_artsplug_compiles="no"
+   ;;
+ esac
+ fi
+ kde_artsplug_compiles=$ac_cv_path_kde_artsplug_compiles
+-
+ if test -n "$kde_artsplug_compiles"; then
+-  echo "$as_me:$LINENO: result: $kde_artsplug_compiles" >&5
+-echo "${ECHO_T}$kde_artsplug_compiles" >&6
++  { echo "$as_me:$LINENO: result: $kde_artsplug_compiles" >&5
++echo "${ECHO_T}$kde_artsplug_compiles" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
++
+     if test x$kde_artsplug_compiles != xno; then
+     ARTSCCONFIG=$kde_artsplug_compiles;
+     kde_artsplug_compiles=yes
+@@ -36784,25 +37365,25 @@
+ 
+   if test x$kde_artsplug_compiles = xyes; then
+     ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
+-    echo "$as_me:$LINENO: result: arts includes... $ARTSC_INCLUDE" >&5
+-echo "${ECHO_T}arts includes... $ARTSC_INCLUDE" >&6
++    { echo "$as_me:$LINENO: result: arts includes... $ARTSC_INCLUDE" >&5
++echo "${ECHO_T}arts includes... $ARTSC_INCLUDE" >&6; }
+ 
+     ARTSC_LIBS=`${ARTSCCONFIG} --libs`
+-    echo "$as_me:$LINENO: result: arts libraries... $ARTSC_LIBS" >&5
+-echo "${ECHO_T}arts libraries... $ARTSC_LIBS" >&6
++    { echo "$as_me:$LINENO: result: arts libraries... $ARTSC_LIBS" >&5
++echo "${ECHO_T}arts libraries... $ARTSC_LIBS" >&6; }
+ 
+ 
+   fi
+ 
+   if test x$kde_mpeglib_compiles = xno; then
+-    echo "$as_me:$LINENO: result: ** mpeglib disabled we disable artsplug **" >&5
+-echo "${ECHO_T}** mpeglib disabled we disable artsplug **" >&6
++    { echo "$as_me:$LINENO: result: ** mpeglib disabled we disable artsplug **" >&5
++echo "${ECHO_T}** mpeglib disabled we disable artsplug **" >&6; }
+     kde_artsplug_compiles=no;
+     fi
+ 
+   if test x$kde_artsplug_compiles = xno; then
+-    echo "$as_me:$LINENO: result: ** DO NOT COMPILE mpeglib_artsplug **" >&5
+-echo "${ECHO_T}** DO NOT COMPILE mpeglib_artsplug **" >&6
++    { echo "$as_me:$LINENO: result: ** DO NOT COMPILE mpeglib_artsplug **" >&5
++echo "${ECHO_T}** DO NOT COMPILE mpeglib_artsplug **" >&6; }
+     DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib_artsplug"
+   fi
+ 
+@@ -36831,13 +37412,13 @@
+   else
+     kde_check_threading_default=yes
+   fi
+-  # Check whether --enable-threading or --disable-threading was given.
++  # Check whether --enable-threading was given.
+ if test "${enable_threading+set}" = set; then
+-  enableval="$enable_threading"
+-  kde_use_threading=$enableval
++  enableval=$enable_threading; kde_use_threading=$enableval
+ else
+   kde_use_threading=$kde_check_threading_default
+-fi;
++fi
++
+   if test "x$kde_use_threading" = "xyes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -36848,17 +37429,17 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking if building standalone aRts snapshot without KDE" >&5
+-echo $ECHO_N "checking if building standalone aRts snapshot without KDE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if building standalone aRts snapshot without KDE" >&5
++echo $ECHO_N "checking if building standalone aRts snapshot without KDE... $ECHO_C" >&6; }
+ if test "$DCOPIDL" = ""; then
+-	echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ 
+ 	# Extract the first word of "artsc-config", so it can be a program name with args.
+ set dummy artsc-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -36873,28 +37454,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no"
+   ;;
+ esac
+ fi
+ ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
+-
+ if test -n "$ARTSCCONFIG"; then
+-  echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
+-echo "${ECHO_T}$ARTSCCONFIG" >&6
++  { echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
++echo "${ECHO_T}$ARTSCCONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+ 	if test "x$ARTSCCONFIG" = "xno" ; then
+ 		{ { echo "$as_me:$LINENO: error: Cannot find artsc-config - missing from path?" >&5
+ echo "$as_me: error: Cannot find artsc-config - missing from path?" >&2;}
+@@ -36919,8 +37501,8 @@
+ 	ARTS_BUILD_KDE=""
+ 	ARTS_BUILD_KDE_GUI=""
+ else
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ 		arts_datadir="$kde_datadir"
+ 	arts_includes="$kde_includes/arts"
+@@ -36951,13 +37533,13 @@
+ 
+ 
+ 
+-# Check whether --with-audiofile or --without-audiofile was given.
++# Check whether --with-audiofile was given.
+ if test "${with_audiofile+set}" = set; then
+-  withval="$with_audiofile"
+-
++  withval=$with_audiofile;
+ else
+   with_audiofile=check
+-fi;
++fi
++
+ 
+ arts_audiolib_found=no
+ if test "x$with_audiofile" != xno; then
+@@ -36968,7 +37550,6 @@
+   CPPFLAGS="$CPPFLAGS $all_includes"
+   arts_audiolib_found=no
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -36977,17 +37558,17 @@
+ 
+   kde_has_audio_lib=no
+   if test "${ac_cv_header_audiofile_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for audiofile.h" >&5
+-echo $ECHO_N "checking for audiofile.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for audiofile.h" >&5
++echo $ECHO_N "checking for audiofile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_audiofile_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_audiofile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_audiofile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_audiofile_h" >&5
++echo "${ECHO_T}$ac_cv_header_audiofile_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking audiofile.h usability" >&5
+-echo $ECHO_N "checking audiofile.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking audiofile.h usability" >&5
++echo $ECHO_N "checking audiofile.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37024,15 +37605,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking audiofile.h presence" >&5
+-echo $ECHO_N "checking audiofile.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking audiofile.h presence" >&5
++echo $ECHO_N "checking audiofile.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37066,9 +37648,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -37092,25 +37675,18 @@
+ echo "$as_me: WARNING: audiofile.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: audiofile.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: audiofile.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for audiofile.h" >&5
+-echo $ECHO_N "checking for audiofile.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for audiofile.h" >&5
++echo $ECHO_N "checking for audiofile.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_audiofile_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_audiofile_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_audiofile_h" >&5
+-echo "${ECHO_T}$ac_cv_header_audiofile_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_audiofile_h" >&5
++echo "${ECHO_T}$ac_cv_header_audiofile_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_audiofile_h = yes; then
+@@ -37130,8 +37706,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for afOpenFile in -laudiofile" >&5
+-echo $ECHO_N "checking for afOpenFile in -laudiofile... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for afOpenFile in -laudiofile" >&5
++echo $ECHO_N "checking for afOpenFile in -laudiofile... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_audiofile_afOpenFile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37144,17 +37720,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char afOpenFile ();
+ int
+ main ()
+ {
+-afOpenFile ();
++return afOpenFile ();
+   ;
+   return 0;
+ }
+@@ -37186,14 +37762,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_audiofile_afOpenFile=no
++	ac_cv_lib_audiofile_afOpenFile=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_audiofile_afOpenFile" >&5
+-echo "${ECHO_T}$ac_cv_lib_audiofile_afOpenFile" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_audiofile_afOpenFile" >&5
++echo "${ECHO_T}$ac_cv_lib_audiofile_afOpenFile" >&6; }
+ if test $ac_cv_lib_audiofile_afOpenFile = yes; then
+         LIBAUDIOFILE="$LDFLAGS -laudiofile"
+ 
+@@ -37235,13 +37812,13 @@
+ 
+ 
+ 
+-# Check whether --with-musicbrainz or --without-musicbrainz was given.
++# Check whether --with-musicbrainz was given.
+ if test "${with_musicbrainz+set}" = set; then
+-  withval="$with_musicbrainz"
+-
++  withval=$with_musicbrainz;
+ else
+   with_musicbrainz=check
+-fi;
++fi
++
+ 
+ have_musicbrainz=no
+ 
+@@ -37250,8 +37827,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -37261,17 +37837,17 @@
+ 
+ 
+    if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5
+-echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5
++echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5
+-echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5
++echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking tunepimp/tp_c.h usability" >&5
+-echo $ECHO_N "checking tunepimp/tp_c.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking tunepimp/tp_c.h usability" >&5
++echo $ECHO_N "checking tunepimp/tp_c.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37308,15 +37884,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking tunepimp/tp_c.h presence" >&5
+-echo $ECHO_N "checking tunepimp/tp_c.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking tunepimp/tp_c.h presence" >&5
++echo $ECHO_N "checking tunepimp/tp_c.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37350,9 +37927,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -37376,25 +37954,18 @@
+ echo "$as_me: WARNING: tunepimp/tp_c.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: tunepimp/tp_c.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5
+-echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5
++echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_tunepimp_tp_c_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5
+-echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_tp_c_h" >&5
++echo "${ECHO_T}$ac_cv_header_tunepimp_tp_c_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_tunepimp_tp_c_h = yes; then
+@@ -37419,8 +37990,8 @@
+ fi
+ 
+ if test "x$have_musicbrainz" = xyes; then
+-  	echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5
+-echo $ECHO_N "checking for tp_SetFileNameEncoding in -ltunepimp... $ECHO_C" >&6
++  	{ echo "$as_me:$LINENO: checking for tp_SetFileNameEncoding in -ltunepimp" >&5
++echo $ECHO_N "checking for tp_SetFileNameEncoding in -ltunepimp... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_tunepimp_tp_SetFileNameEncoding+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37433,17 +38004,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char tp_SetFileNameEncoding ();
+ int
+ main ()
+ {
+-tp_SetFileNameEncoding ();
++return tp_SetFileNameEncoding ();
+   ;
+   return 0;
+ }
+@@ -37475,14 +38046,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_tunepimp_tp_SetFileNameEncoding=no
++	ac_cv_lib_tunepimp_tp_SetFileNameEncoding=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&5
+-echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&5
++echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetFileNameEncoding" >&6; }
+ if test $ac_cv_lib_tunepimp_tp_SetFileNameEncoding = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -37517,13 +38089,13 @@
+ 
+ 
+ 
+-# Check whether --with-gstreamer or --without-gstreamer was given.
++# Check whether --with-gstreamer was given.
+ if test "${with_gstreamer+set}" = set; then
+-  withval="$with_gstreamer"
+-
++  withval=$with_gstreamer;
+ else
+   with_gstreamer=check
+-fi;
++fi
++
+ 
+ have_gst=no
+ 
+@@ -37544,8 +38116,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37560,28 +38132,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -37592,30 +38165,30 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for \
++        { echo "$as_me:$LINENO: checking for \
+ 		gstreamer-$GST_MAJORMINOR >= $GST_REQ" >&5
+ echo $ECHO_N "checking for \
+-		gstreamer-$GST_MAJORMINOR >= $GST_REQ... $ECHO_C" >&6
++		gstreamer-$GST_MAJORMINOR >= $GST_REQ... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists "\
+ 		gstreamer-$GST_MAJORMINOR >= $GST_REQ" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking GST_CFLAGS" >&5
+-echo $ECHO_N "checking GST_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking GST_CFLAGS" >&5
++echo $ECHO_N "checking GST_CFLAGS... $ECHO_C" >&6; }
+             GST_CFLAGS=`$PKG_CONFIG --cflags "\
+ 		gstreamer-$GST_MAJORMINOR >= $GST_REQ"`
+-            echo "$as_me:$LINENO: result: $GST_CFLAGS" >&5
+-echo "${ECHO_T}$GST_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $GST_CFLAGS" >&5
++echo "${ECHO_T}$GST_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking GST_LIBS" >&5
+-echo $ECHO_N "checking GST_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking GST_LIBS" >&5
++echo $ECHO_N "checking GST_LIBS... $ECHO_C" >&6; }
+             GST_LIBS=`$PKG_CONFIG --libs "\
+ 		gstreamer-$GST_MAJORMINOR >= $GST_REQ"`
+-            echo "$as_me:$LINENO: result: $GST_LIBS" >&5
+-echo "${ECHO_T}$GST_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $GST_LIBS" >&5
++echo "${ECHO_T}$GST_LIBS" >&6; }
+         else
+             GST_CFLAGS=""
+             GST_LIBS=""
+@@ -37654,8 +38227,8 @@
+   if test -z "$PKG_CONFIG"; then
+     # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -37670,28 +38243,29 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+   ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+-
+ if test -n "$PKG_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   fi
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+@@ -37702,30 +38276,30 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for \
++        { echo "$as_me:$LINENO: checking for \
+ 			gstreamer-$GST_MAJORMINOR >= $GST_REQ" >&5
+ echo $ECHO_N "checking for \
+-			gstreamer-$GST_MAJORMINOR >= $GST_REQ... $ECHO_C" >&6
++			gstreamer-$GST_MAJORMINOR >= $GST_REQ... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists "\
+ 			gstreamer-$GST_MAJORMINOR >= $GST_REQ" ; then
+-            echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++            { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+             succeeded=yes
+ 
+-            echo "$as_me:$LINENO: checking GST_CFLAGS" >&5
+-echo $ECHO_N "checking GST_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking GST_CFLAGS" >&5
++echo $ECHO_N "checking GST_CFLAGS... $ECHO_C" >&6; }
+             GST_CFLAGS=`$PKG_CONFIG --cflags "\
+ 			gstreamer-$GST_MAJORMINOR >= $GST_REQ"`
+-            echo "$as_me:$LINENO: result: $GST_CFLAGS" >&5
+-echo "${ECHO_T}$GST_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $GST_CFLAGS" >&5
++echo "${ECHO_T}$GST_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking GST_LIBS" >&5
+-echo $ECHO_N "checking GST_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking GST_LIBS" >&5
++echo $ECHO_N "checking GST_LIBS... $ECHO_C" >&6; }
+             GST_LIBS=`$PKG_CONFIG --libs "\
+ 			gstreamer-$GST_MAJORMINOR >= $GST_REQ"`
+-            echo "$as_me:$LINENO: result: $GST_LIBS" >&5
+-echo "${ECHO_T}$GST_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $GST_LIBS" >&5
++echo "${ECHO_T}$GST_LIBS" >&6; }
+         else
+             GST_CFLAGS=""
+             GST_LIBS=""
+@@ -37853,13 +38427,13 @@
+ 
+ 
+ 
+-# Check whether --with-theora or --without-theora was given.
++# Check whether --with-theora was given.
+ if test "${with_theora+set}" = set; then
+-  withval="$with_theora"
+-
++  withval=$with_theora;
+ else
+   with_theora=check
+-fi;
++fi
++
+ 
+ have_theora=no
+ if test "x$with_theora" != xno; then
+@@ -37870,8 +38444,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -37881,17 +38454,17 @@
+ 
+ 
+    if test "${ac_cv_header_theora_theora_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for theora/theora.h" >&5
+-echo $ECHO_N "checking for theora/theora.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for theora/theora.h" >&5
++echo $ECHO_N "checking for theora/theora.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_theora_theora_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_theora_theora_h" >&5
+-echo "${ECHO_T}$ac_cv_header_theora_theora_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_theora_theora_h" >&5
++echo "${ECHO_T}$ac_cv_header_theora_theora_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking theora/theora.h usability" >&5
+-echo $ECHO_N "checking theora/theora.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking theora/theora.h usability" >&5
++echo $ECHO_N "checking theora/theora.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37928,15 +38501,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking theora/theora.h presence" >&5
+-echo $ECHO_N "checking theora/theora.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking theora/theora.h presence" >&5
++echo $ECHO_N "checking theora/theora.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37970,9 +38544,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -37996,25 +38571,18 @@
+ echo "$as_me: WARNING: theora/theora.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: theora/theora.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: theora/theora.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for theora/theora.h" >&5
+-echo $ECHO_N "checking for theora/theora.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for theora/theora.h" >&5
++echo $ECHO_N "checking for theora/theora.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_theora_theora_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_theora_theora_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_theora_theora_h" >&5
+-echo "${ECHO_T}$ac_cv_header_theora_theora_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_theora_theora_h" >&5
++echo "${ECHO_T}$ac_cv_header_theora_theora_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_theora_theora_h = yes; then
+@@ -38043,8 +38611,8 @@
+ 	;;
+      esac
+ 
+-echo "$as_me:$LINENO: checking for theora_info_init in -ltheora" >&5
+-echo $ECHO_N "checking for theora_info_init in -ltheora... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for theora_info_init in -ltheora" >&5
++echo $ECHO_N "checking for theora_info_init in -ltheora... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_theora_theora_info_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38057,17 +38625,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char theora_info_init ();
+ int
+ main ()
+ {
+-theora_info_init ();
++return theora_info_init ();
+   ;
+   return 0;
+ }
+@@ -38099,14 +38667,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_theora_theora_info_init=no
++	ac_cv_lib_theora_theora_info_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_theora_theora_info_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_theora_theora_info_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_theora_theora_info_init" >&5
++echo "${ECHO_T}$ac_cv_lib_theora_theora_info_init" >&6; }
+ if test $ac_cv_lib_theora_theora_info_init = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBTHEORA 1
+@@ -38146,16 +38715,15 @@
+ 
+ 
+ 
+-# Check whether --with-flac or --without-flac was given.
++# Check whether --with-flac was given.
+ if test "${with_flac+set}" = set; then
+-  withval="$with_flac"
+-  flac_test="$withval"
++  withval=$with_flac; flac_test="$withval"
+ else
+   flac_test="yes"
+-fi;
++fi
+ 
+-if test "x$flac_test" = "xyes" ; then
+ 
++if test "x$flac_test" = "xyes" ; then
+ 
+ 
+   ac_ext=c
+@@ -38169,8 +38737,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38180,17 +38747,17 @@
+ 
+ 
+    if test "${ac_cv_header_FLAC_metadata_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for FLAC/metadata.h" >&5
+-echo $ECHO_N "checking for FLAC/metadata.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for FLAC/metadata.h" >&5
++echo $ECHO_N "checking for FLAC/metadata.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_FLAC_metadata_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_metadata_h" >&5
+-echo "${ECHO_T}$ac_cv_header_FLAC_metadata_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_metadata_h" >&5
++echo "${ECHO_T}$ac_cv_header_FLAC_metadata_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking FLAC/metadata.h usability" >&5
+-echo $ECHO_N "checking FLAC/metadata.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking FLAC/metadata.h usability" >&5
++echo $ECHO_N "checking FLAC/metadata.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38227,15 +38794,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking FLAC/metadata.h presence" >&5
+-echo $ECHO_N "checking FLAC/metadata.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking FLAC/metadata.h presence" >&5
++echo $ECHO_N "checking FLAC/metadata.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38269,9 +38837,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -38295,25 +38864,18 @@
+ echo "$as_me: WARNING: FLAC/metadata.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: FLAC/metadata.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: FLAC/metadata.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for FLAC/metadata.h" >&5
+-echo $ECHO_N "checking for FLAC/metadata.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for FLAC/metadata.h" >&5
++echo $ECHO_N "checking for FLAC/metadata.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_FLAC_metadata_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_FLAC_metadata_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_metadata_h" >&5
+-echo "${ECHO_T}$ac_cv_header_FLAC_metadata_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_metadata_h" >&5
++echo "${ECHO_T}$ac_cv_header_FLAC_metadata_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_FLAC_metadata_h = yes; then
+@@ -38327,8 +38889,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_process_single in -lFLAC" >&5
+-echo $ECHO_N "checking for FLAC__seekable_stream_decoder_process_single in -lFLAC... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_process_single in -lFLAC" >&5
++echo $ECHO_N "checking for FLAC__seekable_stream_decoder_process_single in -lFLAC... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38341,17 +38903,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char FLAC__seekable_stream_decoder_process_single ();
+ int
+ main ()
+ {
+-FLAC__seekable_stream_decoder_process_single ();
++return FLAC__seekable_stream_decoder_process_single ();
+   ;
+   return 0;
+ }
+@@ -38383,14 +38945,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=no
++	ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single" >&5
+-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single" >&5
++echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single" >&6; }
+ if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single = yes; then
+   have_libFLAC=yes
+ fi
+@@ -38429,7 +38992,6 @@
+ 
+ 
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -38441,8 +39003,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38452,17 +39013,17 @@
+ 
+ 
+    if test "${ac_cv_header_OggFLAC_seekable_stream_decoder_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for OggFLAC/seekable_stream_decoder.h" >&5
+-echo $ECHO_N "checking for OggFLAC/seekable_stream_decoder.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for OggFLAC/seekable_stream_decoder.h" >&5
++echo $ECHO_N "checking for OggFLAC/seekable_stream_decoder.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_OggFLAC_seekable_stream_decoder_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&5
+-echo "${ECHO_T}$ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&5
++echo "${ECHO_T}$ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking OggFLAC/seekable_stream_decoder.h usability" >&5
+-echo $ECHO_N "checking OggFLAC/seekable_stream_decoder.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking OggFLAC/seekable_stream_decoder.h usability" >&5
++echo $ECHO_N "checking OggFLAC/seekable_stream_decoder.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38499,15 +39060,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking OggFLAC/seekable_stream_decoder.h presence" >&5
+-echo $ECHO_N "checking OggFLAC/seekable_stream_decoder.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking OggFLAC/seekable_stream_decoder.h presence" >&5
++echo $ECHO_N "checking OggFLAC/seekable_stream_decoder.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38541,9 +39103,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -38567,25 +39130,18 @@
+ echo "$as_me: WARNING: OggFLAC/seekable_stream_decoder.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: OggFLAC/seekable_stream_decoder.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: OggFLAC/seekable_stream_decoder.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for OggFLAC/seekable_stream_decoder.h" >&5
+-echo $ECHO_N "checking for OggFLAC/seekable_stream_decoder.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for OggFLAC/seekable_stream_decoder.h" >&5
++echo $ECHO_N "checking for OggFLAC/seekable_stream_decoder.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_OggFLAC_seekable_stream_decoder_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_OggFLAC_seekable_stream_decoder_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&5
+-echo "${ECHO_T}$ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&5
++echo "${ECHO_T}$ac_cv_header_OggFLAC_seekable_stream_decoder_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_OggFLAC_seekable_stream_decoder_h = yes; then
+@@ -38599,8 +39155,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC" >&5
+-echo $ECHO_N "checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC" >&5
++echo $ECHO_N "checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38613,17 +39169,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char OggFLAC__seekable_stream_decoder_process_single ();
+ int
+ main ()
+ {
+-OggFLAC__seekable_stream_decoder_process_single ();
++return OggFLAC__seekable_stream_decoder_process_single ();
+   ;
+   return 0;
+ }
+@@ -38655,14 +39211,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=no
++	ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&5
+-echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&5
++echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&6; }
+ if test $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single = yes; then
+   have_libOggFLAC=yes
+ fi
+@@ -38705,8 +39262,7 @@
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38716,17 +39272,17 @@
+ 
+ 
+    if test "${ac_cv_header_libkmid_libkmid_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libkmid/libkmid.h" >&5
+-echo $ECHO_N "checking for libkmid/libkmid.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for libkmid/libkmid.h" >&5
++echo $ECHO_N "checking for libkmid/libkmid.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libkmid_libkmid_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libkmid_libkmid_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libkmid_libkmid_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libkmid_libkmid_h" >&5
++echo "${ECHO_T}$ac_cv_header_libkmid_libkmid_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libkmid/libkmid.h usability" >&5
+-echo $ECHO_N "checking libkmid/libkmid.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libkmid/libkmid.h usability" >&5
++echo $ECHO_N "checking libkmid/libkmid.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38763,15 +39319,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking libkmid/libkmid.h presence" >&5
+-echo $ECHO_N "checking libkmid/libkmid.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libkmid/libkmid.h presence" >&5
++echo $ECHO_N "checking libkmid/libkmid.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -38805,9 +39362,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+@@ -38831,25 +39389,18 @@
+ echo "$as_me: WARNING: libkmid/libkmid.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libkmid/libkmid.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libkmid/libkmid.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libkmid/libkmid.h" >&5
+-echo $ECHO_N "checking for libkmid/libkmid.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libkmid/libkmid.h" >&5
++echo $ECHO_N "checking for libkmid/libkmid.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libkmid_libkmid_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_libkmid_libkmid_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libkmid_libkmid_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libkmid_libkmid_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libkmid_libkmid_h" >&5
++echo "${ECHO_T}$ac_cv_header_libkmid_libkmid_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_libkmid_libkmid_h = yes; then
+@@ -38877,8 +39428,8 @@
+   DO_NOT_COMPILE="$DO_NOT_COMPILE krec"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for main in -lcdaudio" >&5
+-echo $ECHO_N "checking for main in -lcdaudio... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lcdaudio" >&5
++echo $ECHO_N "checking for main in -lcdaudio... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_cdaudio_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38895,7 +39446,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -38927,20 +39478,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_cdaudio_main=no
++	ac_cv_lib_cdaudio_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_cdaudio_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_cdaudio_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_cdaudio_main" >&5
++echo "${ECHO_T}$ac_cv_lib_cdaudio_main" >&6; }
+ if test $ac_cv_lib_cdaudio_main = yes; then
+   LIBCDAUDIO="-lcdaudio -lmediad -lds"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for main in -lfpe" >&5
+-echo $ECHO_N "checking for main in -lfpe... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lfpe" >&5
++echo $ECHO_N "checking for main in -lfpe... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_fpe_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38957,7 +39509,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -38989,19 +39541,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_fpe_main=no
++	ac_cv_lib_fpe_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_fpe_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_fpe_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_fpe_main" >&5
++echo "${ECHO_T}$ac_cv_lib_fpe_main" >&6; }
+ if test $ac_cv_lib_fpe_main = yes; then
+   LIBFPE="-lfpe"
+ fi
+-  echo "$as_me:$LINENO: checking for main in -lcdrom" >&5
+-echo $ECHO_N "checking for main in -lcdrom... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for main in -lcdrom" >&5
++echo $ECHO_N "checking for main in -lcdrom... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_cdrom_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39018,7 +39571,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -39050,21 +39603,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_cdrom_main=no
++	ac_cv_lib_cdrom_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_cdrom_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_cdrom_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_cdrom_main" >&5
++echo "${ECHO_T}$ac_cv_lib_cdrom_main" >&6; }
+ if test $ac_cv_lib_cdrom_main = yes; then
+   LIBCDROM="-lcdrom"
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lAlib" >&5
+-echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lAlib" >&5
++echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Alib_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39081,7 +39635,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -39113,20 +39667,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Alib_main=no
++	ac_cv_lib_Alib_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_main" >&5
++echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6; }
+ if test $ac_cv_lib_Alib_main = yes; then
+   LIBALIB="-lAlib"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for main in -laudio" >&5
+-echo $ECHO_N "checking for main in -laudio... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -laudio" >&5
++echo $ECHO_N "checking for main in -laudio... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_audio_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39143,7 +39698,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -39175,20 +39730,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_audio_main=no
++	ac_cv_lib_audio_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_audio_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_audio_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_audio_main" >&5
++echo "${ECHO_T}$ac_cv_lib_audio_main" >&6; }
+ if test $ac_cv_lib_audio_main = yes; then
+   LIBAUDIO="-laudio"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for main in -lmme" >&5
+-echo $ECHO_N "checking for main in -lmme... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lmme" >&5
++echo $ECHO_N "checking for main in -lmme... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mme_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39205,7 +39761,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -39237,14 +39793,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_mme_main=no
++	ac_cv_lib_mme_main=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_mme_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_mme_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mme_main" >&5
++echo "${ECHO_T}$ac_cv_lib_mme_main" >&6; }
+ if test $ac_cv_lib_mme_main = yes; then
+   LIBMME="-lmme";EXTRAINCS="-I/usr/include/mme"
+ fi
+@@ -39253,10 +39810,9 @@
+ 
+ 
+ 
+-# Check whether --enable-kscd-defaults or --disable-kscd-defaults was given.
++# Check whether --enable-kscd-defaults was given.
+ if test "${enable_kscd_defaults+set}" = set; then
+-  enableval="$enable_kscd_defaults"
+-
++  enableval=$enable_kscd_defaults;
+ if test $enableval = "no";   then use_kscd_defaults="no"
+   else use_kscd_defaults="yes"
+ fi
+@@ -39264,16 +39820,17 @@
+ else
+   use_kscd_defaults="yes"
+ 
+-fi;
++fi
+ 
+ 
+ 
+-          ac_config_commands="$ac_config_commands default-1"
+ 
++ac_config_commands="$ac_config_commands default-1"
+ 
+ 
+-echo "$as_me:$LINENO: checking if kscd can be compiled" >&5
+-echo $ECHO_N "checking if kscd can be compiled... $ECHO_C" >&6
++
++{ echo "$as_me:$LINENO: checking if kscd can be compiled" >&5
++echo $ECHO_N "checking if kscd can be compiled... $ECHO_C" >&6; }
+ case "$host" in
+   *-*-linux*) kscd_compile=yes;;
+   *-*-*bsdi*) kscd_compile=yes;;
+@@ -39282,8 +39839,8 @@
+   *-*-*openbsd*) kscd_compile=yes;;
+   *) kscd_compile=yes;;
+ esac
+-echo "$as_me:$LINENO: result: $kscd_compile" >&5
+-echo "${ECHO_T}$kscd_compile" >&6
++{ echo "$as_me:$LINENO: result: $kscd_compile" >&5
++echo "${ECHO_T}$kscd_compile" >&6; }
+ if test "$kscd_compile" = "no"; then
+   DO_NOT_COMPILE="$DO_NOT_COMPILE kscd"
+ fi
+@@ -39297,14 +39854,13 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for CDDA" >&5
+-echo $ECHO_N "checking for CDDA... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for CDDA" >&5
++echo $ECHO_N "checking for CDDA... $ECHO_C" >&6; }
+ 
+ 
+-# Check whether --with-kscd-cdda or --without-kscd-cdda was given.
++# Check whether --with-kscd-cdda was given.
+ if test "${with_kscd_cdda+set}" = set; then
+-  withval="$with_kscd_cdda"
+-
++  withval=$with_kscd_cdda;
+   if test $withval = yes; then
+     libwm_with_cdda=yes
+   else
+@@ -39313,7 +39869,8 @@
+ 
+ else
+   libwm_with_cdda=yes
+-fi;
++fi
++
+ 
+ if test "$libwm_with_cdda" = "yes"; then
+ case $host in
+@@ -39322,18 +39879,19 @@
+ for ac_header in pthread.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39370,15 +39928,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39412,9 +39971,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -39438,25 +39998,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -39530,8 +40084,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-libwm_with_cdda=no
++	libwm_with_cdda=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   ;;
+   *-*-sunos*)
+@@ -39539,18 +40094,19 @@
+ for ac_header in pthread.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39587,15 +40143,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39629,9 +40186,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -39655,25 +40213,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -39736,8 +40288,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-libwm_with_cdda=no
++	libwm_with_cdda=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   ;;
+   *)
+@@ -39764,8 +40317,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $libwm_with_cdda" >&5
+-echo "${ECHO_T}$libwm_with_cdda" >&6
++{ echo "$as_me:$LINENO: result: $libwm_with_cdda" >&5
++echo "${ECHO_T}$libwm_with_cdda" >&6; }
+ 
+ 
+ 
+@@ -39790,18 +40343,19 @@
+ for ac_header in pthread.h pthread/mit/pthread.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39838,15 +40392,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39880,9 +40435,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -39906,25 +40462,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -39941,18 +40491,19 @@
+ for ac_header in sys/soundcard.h soundcard.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39989,15 +40540,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40031,9 +40583,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -40057,25 +40610,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -40089,8 +40636,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40185,14 +40732,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_bigendian=no
++	ac_cv_c_bigendian=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# It does not; compile a test program.
++	# It does not; compile a test program.
+ if test "$cross_compiling" = yes; then
+   # try to guess the endianness by grepping values into an object file
+   ac_cv_c_bigendian=unknown
+@@ -40202,11 +40750,11 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+ int
+ main ()
+@@ -40253,7 +40801,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -40262,17 +40812,22 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++$ac_includes_default
+ int
+ main ()
+ {
++
+   /* Are we little or big endian?  From Harbison&Steele.  */
+   union
+   {
+-    long l;
+-    char c[sizeof (long)];
++    long int l;
++    char c[sizeof (long int)];
+   } u;
+   u.l = 1;
+-  exit (u.c[sizeof (long) - 1] == 1);
++  return u.c[sizeof (long int) - 1] == 1;
++
++  ;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -40295,13 +40850,16 @@
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in
+   yes)
+ 
+@@ -40325,8 +40883,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking __attribute__ ((aligned ())) support" >&5
+-echo $ECHO_N "checking __attribute__ ((aligned ())) support... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking __attribute__ ((aligned ())) support" >&5
++echo $ECHO_N "checking __attribute__ ((aligned ())) support... $ECHO_C" >&6; }
+ if test "${ac_cv_c_attribute_aligned+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40374,12 +40932,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 	done
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5
+-echo "${ECHO_T}$ac_cv_c_attribute_aligned" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5
++echo "${ECHO_T}$ac_cv_c_attribute_aligned" >&6; }
+     if test x"$ac_cv_c_attribute_aligned" != x"0"; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -40402,8 +40962,8 @@
+ LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
+ LIBS="$LIBS $LIB_XEXT -lX11 $X_EXTRA_LIBS"
+ 
+-echo "$as_me:$LINENO: checking for X11 shared mem extension" >&5
+-echo $ECHO_N "checking for X11 shared mem extension... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11 shared mem extension" >&5
++echo $ECHO_N "checking for X11 shared mem extension... $ECHO_C" >&6; }
+ x11_shared_mem=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40455,10 +41015,12 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $x11_shared_mem" >&5
+-echo "${ECHO_T}$x11_shared_mem" >&6
++{ echo "$as_me:$LINENO: result: $x11_shared_mem" >&5
++echo "${ECHO_T}$x11_shared_mem" >&6; }
+ if test x$x11_shared_mem = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -40468,8 +41030,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for X11 DGA2.0 extension" >&5
+-echo $ECHO_N "checking for X11 DGA2.0 extension... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11 DGA2.0 extension" >&5
++echo $ECHO_N "checking for X11 DGA2.0 extension... $ECHO_C" >&6; }
+ x11_dga2=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40519,10 +41081,12 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $x11_dga2" >&5
+-echo "${ECHO_T}$x11_dga2" >&6
++{ echo "$as_me:$LINENO: result: $x11_dga2" >&5
++echo "${ECHO_T}$x11_dga2" >&6; }
+ if test x$x11_dga2 = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -40532,8 +41096,8 @@
+    DGALIBS="-lXxf86dga"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for X11 video extension" >&5
+-echo $ECHO_N "checking for X11 video extension... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11 video extension" >&5
++echo $ECHO_N "checking for X11 video extension... $ECHO_C" >&6; }
+ x11_xv=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40583,10 +41147,12 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $x11_xv" >&5
+-echo "${ECHO_T}$x11_xv" >&6
++{ echo "$as_me:$LINENO: result: $x11_xv" >&5
++echo "${ECHO_T}$x11_xv" >&6; }
+ if test x$x11_xv = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -40596,8 +41162,8 @@
+    XVLIBS="-lXv"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for X11 videomode extension" >&5
+-echo $ECHO_N "checking for X11 videomode extension... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11 videomode extension" >&5
++echo $ECHO_N "checking for X11 videomode extension... $ECHO_C" >&6; }
+ x11_xvidmode=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -40647,10 +41213,12 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $x11_xvidmode" >&5
+-echo "${ECHO_T}$x11_xvidmode" >&6
++{ echo "$as_me:$LINENO: result: $x11_xvidmode" >&5
++echo "${ECHO_T}$x11_xvidmode" >&6; }
+ if test x$x11_xvidmode = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -40674,22 +41242,14 @@
+ LDFLAGS="$mpg_save_LDFLAGS"
+ CPPFLAGS="$mpg_save_CPPFLAGS"
+ 
+-echo "$as_me:$LINENO: checking checking OS" >&5
+-echo $ECHO_N "checking checking OS... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking checking OS" >&5
++echo $ECHO_N "checking checking OS... $ECHO_C" >&6; }
+ 
+ OS_TYPE=`uname -s`
+-echo "$as_me:$LINENO: result: $OS_TYPE" >&5
+-echo "${ECHO_T}$OS_TYPE" >&6
++{ echo "$as_me:$LINENO: result: $OS_TYPE" >&5
++echo "${ECHO_T}$OS_TYPE" >&6; }
+ 
  INTELCPPFLAG=
 -if test x$MMX_SUPPORT = xyes; then
 -
@@ -17693,177 +34676,1824 @@
  
  
  
-@@ -40767,8 +40222,7 @@
-   cat conftest.err >&5
+@@ -40714,8 +41274,8 @@
+     kde_mpeglib_compiles=yes
+     ;;
+   *)
+-    echo "$as_me:$LINENO: result: *** We disable mpeglib for this platform ***" >&5
+-echo "${ECHO_T}*** We disable mpeglib for this platform ***" >&6
++    { echo "$as_me:$LINENO: result: *** We disable mpeglib for this platform ***" >&5
++echo "${ECHO_T}*** We disable mpeglib for this platform ***" >&6; }
+     DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
+     ;;
+ esac
+@@ -40730,8 +41290,8 @@
+     else
+       PTHREAD_LIBS_save="$PTHREAD_LIBS"
+       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
+-      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
+ 
+      kde_save_LDFLAGS="$LDFLAGS"
+           kde_save_LIBS="$LIBS"
+@@ -40742,9 +41302,9 @@
+ 	;;
+      esac
+      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
++echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -40756,17 +41316,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+@@ -40798,14 +41358,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Lib=no"
++	eval "$as_ac_Lib=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -40818,8 +41380,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD"; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40832,17 +41394,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pthread_create ();
+ int
+ main ()
+ {
+-pthread_create ();
++return pthread_create ();
+   ;
+   return 0;
+ }
+@@ -40874,14 +41436,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pthread_pthread_create=no
++	ac_cv_lib_pthread_pthread_create=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+   LIBPTHREAD="-lpthread"
+ fi
+@@ -40889,8 +41452,8 @@
+   fi
+ 
+     if test -z "$LIBPTHREAD" ; then
+-    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+     kde_safe_libs=$LIBS
+     LIBS="$LIBS -lpthread"
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -40931,17 +41494,18 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (exit $ac_status); }; }; then
+ 
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+         LIBPTHREAD="-lpthread"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-	echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS=$kde_safe_libs
+@@ -40955,8 +41519,8 @@
+ 
+ case "$OS_TYPE" in
+   AIX)
+-    echo "$as_me:$LINENO: result: AIX :Unknown hardware. You will have problems!!" >&5
+-echo "${ECHO_T}AIX :Unknown hardware. You will have problems!!" >&6
++    { echo "$as_me:$LINENO: result: AIX :Unknown hardware. You will have problems!!" >&5
++echo "${ECHO_T}AIX :Unknown hardware. You will have problems!!" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define OS_AIX 1
+@@ -40991,8 +41555,8 @@
+     ;;
+ 
+   NetBSD)
+-    echo "$as_me:$LINENO: result: NetBSD :Unknown hardware. You will have problems!!" >&5
+-echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6
++    { echo "$as_me:$LINENO: result: NetBSD :Unknown hardware. You will have problems!!" >&5
++echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6; }
+     OS_TYPE="BSD"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41011,8 +41575,8 @@
+     ;;
+ 
+   IRIX)
+-    echo "$as_me:$LINENO: result: IRIX :Unknown hardware. You will have problems!!" >&5
+-echo "${ECHO_T}IRIX :Unknown hardware. You will have problems!!" >&6
++    { echo "$as_me:$LINENO: result: IRIX :Unknown hardware. You will have problems!!" >&5
++echo "${ECHO_T}IRIX :Unknown hardware. You will have problems!!" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define OS_IRIX 1
+@@ -41021,8 +41585,8 @@
+     ;;
+ 
+   HPUX)
+-    echo "$as_me:$LINENO: result: HPUX :Unknown hardware. You will have problems!!" >&5
+-echo "${ECHO_T}HPUX :Unknown hardware. You will have problems!!" >&6
++    { echo "$as_me:$LINENO: result: HPUX :Unknown hardware. You will have problems!!" >&5
++echo "${ECHO_T}HPUX :Unknown hardware. You will have problems!!" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define OS_HPUX 1
+@@ -41031,8 +41595,8 @@
+     ;;
+ 
+   *)
+-    echo "$as_me:$LINENO: result: Very Unknown hardware. **Better give up!**" >&5
+-echo "${ECHO_T}Very Unknown hardware. **Better give up!**" >&6
++    { echo "$as_me:$LINENO: result: Very Unknown hardware. **Better give up!**" >&5
++echo "${ECHO_T}Very Unknown hardware. **Better give up!**" >&6; }
+     ;;
+ 
+ esac
+@@ -41183,9 +41747,9 @@
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -41233,12 +41797,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Header=no"
++	eval "$as_ac_Header=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+@@ -41250,13 +41816,12 @@
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+ if test "${ac_cv_search_opendir+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41264,149 +41829,29 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { 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=$?
-@@ -40843,8 +40297,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="none required"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in dir; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
-+	 { 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
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
+-fi
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+-
+-fi
+-
+-else
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' dir; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
    ac_status=$?
-@@ -40904,8 +40357,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
+@@ -41428,40 +41873,73 @@
    ac_status=$?
-@@ -41202,8 +40654,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
+   (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="none required"
++  ac_cv_search_opendir=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in x; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
++      conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then
++  break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++  :
++else
++  ac_cv_search_opendir=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++else
++  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char opendir ();
+ int
+ main ()
+ {
+-opendir ();
++return opendir ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
++for ac_lib in '' x; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
    ac_status=$?
-@@ -41275,8 +40726,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
+@@ -41483,30 +41961,40 @@
    ac_status=$?
-@@ -41330,8 +40780,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=$?
-@@ -41402,8 +40851,7 @@
-   cat conftest.err >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
++  ac_cv_search_opendir=$ac_res
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
++      conftest$ac_exeext
++  if test "${ac_cv_search_opendir+set}" = set; then
++  break
++fi
++done
++if test "${ac_cv_search_opendir+set}" = set; then
++  :
++else
++  ac_cv_search_opendir=no
+ fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
++echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
++ac_res=$ac_cv_search_opendir
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+ fi
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41556,8 +42044,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
++	ac_cv_header_stdc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+@@ -41614,6 +42103,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -41633,8 +42123,8 @@
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -41657,12 +42147,14 @@
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41671,8 +42163,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41722,12 +42214,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_time=no
++	ac_cv_header_time=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41744,18 +42237,19 @@
+ for ac_header in fcntl.h sys/time.h unistd.h stdlib.h paths.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41792,15 +42286,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41834,9 +42329,10 @@
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+@@ -41860,25 +42356,19 @@
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -41894,9 +42384,9 @@
+ for ac_func in usleep
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -41922,30 +42412,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -41977,13 +42461,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -42011,11 +42497,10 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for XShmGetEventBase" >&5
+-echo $ECHO_N "checking for XShmGetEventBase... $ECHO_C" >&6
+-
++{ echo "$as_me:$LINENO: checking for XShmGetEventBase" >&5
++echo $ECHO_N "checking for XShmGetEventBase... $ECHO_C" >&6; }
+ 
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -42068,8 +42553,8 @@
    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=$?
-@@ -41457,8 +40905,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=$?
-@@ -41525,8 +40972,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=$?
-@@ -41691,8 +41137,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=$?
-@@ -41761,8 +41206,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=$?
-@@ -41946,8 +41390,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=$?
-@@ -42041,8 +41484,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=$?
-@@ -42128,8 +41570,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=$?
-@@ -42233,8 +41674,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=$?
-@@ -42531,8 +41971,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=$?
-@@ -42654,8 +42093,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=$?
-@@ -43372,6 +42810,13 @@
+   (exit $ac_status); }; }; then
+ 
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_XSHMGETEVENTBASE 1
+@@ -42081,11 +42566,12 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -42103,8 +42589,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for _x_ao_new_port in -lxine" >&5
+-echo $ECHO_N "checking for _x_ao_new_port in -lxine... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for _x_ao_new_port in -lxine" >&5
++echo $ECHO_N "checking for _x_ao_new_port in -lxine... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_xine__x_ao_new_port+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42117,17 +42603,17 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char _x_ao_new_port ();
+ int
+ main ()
+ {
+-_x_ao_new_port ();
++return _x_ao_new_port ();
+   ;
+   return 0;
+ }
+@@ -42159,14 +42645,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_xine__x_ao_new_port=no
++	ac_cv_lib_xine__x_ao_new_port=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_xine__x_ao_new_port" >&5
+-echo "${ECHO_T}$ac_cv_lib_xine__x_ao_new_port" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_xine__x_ao_new_port" >&5
++echo "${ECHO_T}$ac_cv_lib_xine__x_ao_new_port" >&6; }
+ if test $ac_cv_lib_xine__x_ao_new_port = yes; then
+   :
+ else
+@@ -42181,8 +42668,8 @@
+      LDFLAGS="$kde_save_LDFLAGS"
+      LIBS="$kde_save_LIBS"
+ 
+-echo "$as_me:$LINENO: checking for ao_new_port" >&5
+-echo $ECHO_N "checking for ao_new_port... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ao_new_port" >&5
++echo $ECHO_N "checking for ao_new_port... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ao_new_port+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42209,30 +42696,24 @@
+ 
+ #undef ao_new_port
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char ao_new_port ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_ao_new_port) || defined (__stub___ao_new_port)
++#if defined __stub_ao_new_port || defined __stub___ao_new_port
+ choke me
+-#else
+-char (*f) () = ao_new_port;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != ao_new_port;
++return ao_new_port ();
+   ;
+   return 0;
+ }
+@@ -42264,49 +42745,50 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_ao_new_port=no
++	ac_cv_func_ao_new_port=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_ao_new_port" >&5
+-echo "${ECHO_T}$ac_cv_func_ao_new_port" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ao_new_port" >&5
++echo "${ECHO_T}$ac_cv_func_ao_new_port" >&6; }
+ 
+ 
+ 
+-# Check whether --with-xine or --without-xine was given.
++# Check whether --with-xine was given.
+ if test "${with_xine+set}" = set; then
+-  withval="$with_xine"
+-
++  withval=$with_xine;
+ else
+   with_xine=check
+-fi;
++fi
++
+ 
+ have_xine=no
+ if test "x$with_xine" != xno; then
+ 
+-# Check whether --with-xine-prefix or --without-xine-prefix was given.
++# Check whether --with-xine-prefix was given.
+ if test "${with_xine_prefix+set}" = set; then
+-  withval="$with_xine_prefix"
+-  xine_config_prefix="$withval"
++  withval=$with_xine_prefix; xine_config_prefix="$withval"
+ else
+   xine_config_prefix=""
+-fi;
++fi
+ 
+-# Check whether --with-xine-exec-prefix or --without-xine-exec-prefix was given.
++
++# Check whether --with-xine-exec-prefix was given.
+ if test "${with_xine_exec_prefix+set}" = set; then
+-  withval="$with_xine_exec_prefix"
+-  xine_config_exec_prefix="$withval"
++  withval=$with_xine_exec_prefix; xine_config_exec_prefix="$withval"
+ else
+   xine_config_exec_prefix=""
+-fi;
+-# Check whether --enable-xinetest or --disable-xinetest was given.
+-if test "${enable_xinetest+set}" = set; then
+-  enableval="$enable_xinetest"
++fi
+ 
++# Check whether --enable-xinetest was given.
++if test "${enable_xinetest+set}" = set; then
++  enableval=$enable_xinetest;
+ else
+   enable_xinetest=yes
+-fi;
++fi
++
+ 
+   if test x$xine_config_exec_prefix != x ; then
+      xine_config_args="$xine_config_args --exec-prefix=$xine_config_exec_prefix"
+@@ -42323,13 +42805,13 @@
+ 
+   min_xine_version=1.0.0
+   if test "x$enable_xinetest" != "xyes" ; then
+-    echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5
+-echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5
++echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6; }
+   else
+     # Extract the first word of "xine-config", so it can be a program name with args.
+ set dummy xine-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_XINE_CONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42344,30 +42826,31 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_XINE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_XINE_CONFIG" && ac_cv_path_XINE_CONFIG="no"
+   ;;
+ esac
+ fi
+ XINE_CONFIG=$ac_cv_path_XINE_CONFIG
+-
+ if test -n "$XINE_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $XINE_CONFIG" >&5
+-echo "${ECHO_T}$XINE_CONFIG" >&6
++  { echo "$as_me:$LINENO: result: $XINE_CONFIG" >&5
++echo "${ECHO_T}$XINE_CONFIG" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+-    echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5
+-echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6
++
++    { echo "$as_me:$LINENO: checking for XINE-LIB version >= $min_xine_version" >&5
++echo $ECHO_N "checking for XINE-LIB version >= $min_xine_version... $ECHO_C" >&6; }
+     no_xine=""
+     if test "$XINE_CONFIG" = "no" ; then
+       no_xine=yes
+@@ -42388,7 +42871,6 @@
+       CFLAGS="$CFLAGS $XINE_CFLAGS $all_includes"
+       LIBS="$XINE_LIBS $LIBS $all_libraries"
+ 
+-
+       ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -42492,19 +42974,21 @@
+ ( exit $ac_status )
+ no_xine=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+      fi
+     fi
+     if test "x$no_xine" = x ; then
+-       echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++       { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+        have_xine=yes
+     else
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       if test "$XINE_CONFIG" = "no" ; then
+         echo "*** The xine-config script installed by XINE could not be found"
+         echo "*** If XINE was installed in PREFIX, make sure PREFIX/bin is in"
+@@ -42571,11 +43055,12 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- echo "*** The test program failed to compile or link. See the file config.log for the"
++	 echo "*** The test program failed to compile or link. See the file config.log for the"
+           echo "*** exact error that occured. This usually means XINE was incorrectly installed"
+           echo "*** or that you have moved XINE since it was installed. In the latter case, you"
+           echo "*** may want to edit the xine-config script: $XINE_CONFIG"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+@@ -42602,9 +43087,9 @@
+ for ac_func in strsep strpbrk setenv
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -42630,30 +43115,24 @@
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -42685,13 +43164,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+@@ -42733,8 +43214,8 @@
+ fi
+ 
+ for i in $ac_topsubdirs; do
+-  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
+-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
++echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
+   if test -d $srcdir/$i; then
+     install_it="yes"
+     for j in $DO_NOT_COMPILE; do
+@@ -42745,8 +43226,8 @@
+   else
+     install_it="no"
+   fi
+-  echo "$as_me:$LINENO: result: $install_it" >&5
+-echo "${ECHO_T}$install_it" >&6
++  { echo "$as_me:$LINENO: result: $install_it" >&5
++echo "${ECHO_T}$install_it" >&6; }
+   vari=`echo $i | sed -e 's,[-+.@],_,g'`
+   if test $install_it = "yes"; then
+     TOPSUBDIRS="$TOPSUBDIRS $i"
+@@ -42968,331 +43449,331 @@
+   mpeglib_artsplug_SUBDIR_included_FALSE=
+ fi
+ 
+-          ac_config_files="$ac_config_files Makefile"
++ac_config_files="$ac_config_files Makefile"
+ 
+-          ac_config_files="$ac_config_files akode_artsplugin/Makefile"
++ac_config_files="$ac_config_files akode_artsplugin/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/Makefile"
++ac_config_files="$ac_config_files arts/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/builder/Makefile"
++ac_config_files="$ac_config_files arts/builder/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/builder/pics/Makefile"
++ac_config_files="$ac_config_files arts/builder/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/examples/Makefile"
++ac_config_files="$ac_config_files arts/examples/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/gui/Makefile"
++ac_config_files="$ac_config_files arts/gui/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/gui/common/Makefile"
++ac_config_files="$ac_config_files arts/gui/common/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/gui/kde/Makefile"
++ac_config_files="$ac_config_files arts/gui/kde/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/gui/kde/mcopclass/Makefile"
++ac_config_files="$ac_config_files arts/gui/kde/mcopclass/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/midi/Makefile"
++ac_config_files="$ac_config_files arts/midi/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/midi/mcopclass/Makefile"
++ac_config_files="$ac_config_files arts/midi/mcopclass/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/modules/Makefile"
++ac_config_files="$ac_config_files arts/modules/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/modules/common/Makefile"
++ac_config_files="$ac_config_files arts/modules/common/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/modules/effects/Makefile"
++ac_config_files="$ac_config_files arts/modules/effects/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/modules/effects/freeverb/Makefile"
++ac_config_files="$ac_config_files arts/modules/effects/freeverb/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/modules/mixers/Makefile"
++ac_config_files="$ac_config_files arts/modules/mixers/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/modules/synth/Makefile"
++ac_config_files="$ac_config_files arts/modules/synth/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/runtime/Makefile"
++ac_config_files="$ac_config_files arts/runtime/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/tools/Makefile"
++ac_config_files="$ac_config_files arts/tools/Makefile"
+ 
+-          ac_config_files="$ac_config_files arts/tools/pics/Makefile"
++ac_config_files="$ac_config_files arts/tools/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files audiofile_artsplugin/Makefile"
++ac_config_files="$ac_config_files audiofile_artsplugin/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/Makefile"
++ac_config_files="$ac_config_files doc/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/artsbuilder/Makefile"
++ac_config_files="$ac_config_files doc/artsbuilder/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/artsbuilder/images/Makefile"
++ac_config_files="$ac_config_files doc/artsbuilder/images/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/juk/Makefile"
++ac_config_files="$ac_config_files doc/juk/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kaboodle/Makefile"
++ac_config_files="$ac_config_files doc/kaboodle/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kaudiocreator/Makefile"
++ac_config_files="$ac_config_files doc/kaudiocreator/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kioslave/Makefile"
++ac_config_files="$ac_config_files doc/kioslave/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kmid/Makefile"
++ac_config_files="$ac_config_files doc/kmid/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kmix/Makefile"
++ac_config_files="$ac_config_files doc/kmix/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/krec/Makefile"
++ac_config_files="$ac_config_files doc/krec/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/kscd/Makefile"
++ac_config_files="$ac_config_files doc/kscd/Makefile"
+ 
+-          ac_config_files="$ac_config_files doc/noatun/Makefile"
++ac_config_files="$ac_config_files doc/noatun/Makefile"
+ 
+-          ac_config_files="$ac_config_files juk/Makefile"
++ac_config_files="$ac_config_files juk/Makefile"
+ 
+-          ac_config_files="$ac_config_files juk/pics/Makefile"
++ac_config_files="$ac_config_files juk/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files kaboodle/Makefile"
++ac_config_files="$ac_config_files kaboodle/Makefile"
+ 
+-          ac_config_files="$ac_config_files kaboodle/actions/Makefile"
++ac_config_files="$ac_config_files kaboodle/actions/Makefile"
+ 
+-          ac_config_files="$ac_config_files kaboodle/pics/Makefile"
++ac_config_files="$ac_config_files kaboodle/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files kappfinder-data/Makefile"
++ac_config_files="$ac_config_files kappfinder-data/Makefile"
+ 
+-          ac_config_files="$ac_config_files kaudiocreator/Makefile"
++ac_config_files="$ac_config_files kaudiocreator/Makefile"
+ 
+-          ac_config_files="$ac_config_files kaudiocreator/icons/Makefile"
++ac_config_files="$ac_config_files kaudiocreator/icons/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/au/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/au/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/avi/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/avi/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/flac/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/flac/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/m3u/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/m3u/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/mp3/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/mp3/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/mpc/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/mpc/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/mpeg/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/mpeg/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/ogg/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/ogg/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/sid/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/sid/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/theora/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/theora/Makefile"
+ 
+-          ac_config_files="$ac_config_files kfile-plugins/wav/Makefile"
++ac_config_files="$ac_config_files kfile-plugins/wav/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/Makefile"
++ac_config_files="$ac_config_files kioslave/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/audiocd/Makefile"
++ac_config_files="$ac_config_files kioslave/audiocd/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/audiocd/kcmaudiocd/Makefile"
++ac_config_files="$ac_config_files kioslave/audiocd/kcmaudiocd/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/audiocd/plugins/Makefile"
++ac_config_files="$ac_config_files kioslave/audiocd/plugins/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/audiocd/plugins/flac/Makefile"
++ac_config_files="$ac_config_files kioslave/audiocd/plugins/flac/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/audiocd/plugins/lame/Makefile"
++ac_config_files="$ac_config_files kioslave/audiocd/plugins/lame/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/audiocd/plugins/vorbis/Makefile"
++ac_config_files="$ac_config_files kioslave/audiocd/plugins/vorbis/Makefile"
+ 
+-          ac_config_files="$ac_config_files kioslave/audiocd/plugins/wav/Makefile"
++ac_config_files="$ac_config_files kioslave/audiocd/plugins/wav/Makefile"
+ 
+-          ac_config_files="$ac_config_files kmid/Makefile"
++ac_config_files="$ac_config_files kmid/Makefile"
+ 
+-          ac_config_files="$ac_config_files kmid/examples/Makefile"
++ac_config_files="$ac_config_files kmid/examples/Makefile"
+ 
+-          ac_config_files="$ac_config_files kmid/maps/Makefile"
++ac_config_files="$ac_config_files kmid/maps/Makefile"
+ 
+-          ac_config_files="$ac_config_files kmid/pics/Makefile"
++ac_config_files="$ac_config_files kmid/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files kmix/Makefile"
++ac_config_files="$ac_config_files kmix/Makefile"
+ 
+-          ac_config_files="$ac_config_files kmix/pics/Makefile"
++ac_config_files="$ac_config_files kmix/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files krec/Makefile"
++ac_config_files="$ac_config_files krec/Makefile"
+ 
+-          ac_config_files="$ac_config_files krec/mp3_export/Makefile"
++ac_config_files="$ac_config_files krec/mp3_export/Makefile"
+ 
+-          ac_config_files="$ac_config_files krec/ogg_export/Makefile"
++ac_config_files="$ac_config_files krec/ogg_export/Makefile"
+ 
+-          ac_config_files="$ac_config_files krec/pics/Makefile"
++ac_config_files="$ac_config_files krec/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files kscd/Makefile"
++ac_config_files="$ac_config_files kscd/Makefile"
+ 
+-          ac_config_files="$ac_config_files kscd/bitmaps/Makefile"
++ac_config_files="$ac_config_files kscd/bitmaps/Makefile"
+ 
+-          ac_config_files="$ac_config_files kscd/kscdmagic/Makefile"
++ac_config_files="$ac_config_files kscd/kscdmagic/Makefile"
+ 
+-          ac_config_files="$ac_config_files kscd/libwm/Makefile"
++ac_config_files="$ac_config_files kscd/libwm/Makefile"
+ 
+-          ac_config_files="$ac_config_files kscd/libwm/audio/Makefile"
++ac_config_files="$ac_config_files kscd/libwm/audio/Makefile"
+ 
+-          ac_config_files="$ac_config_files libkcddb/Makefile"
++ac_config_files="$ac_config_files libkcddb/Makefile"
+ 
+-          ac_config_files="$ac_config_files libkcddb/kcmcddb/Makefile"
++ac_config_files="$ac_config_files libkcddb/kcmcddb/Makefile"
+ 
+-          ac_config_files="$ac_config_files libkcddb/test/Makefile"
++ac_config_files="$ac_config_files libkcddb/test/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/Makefile"
++ac_config_files="$ac_config_files mpeglib/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/cddaplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/cddaplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/mpgplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/mpgplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/splay/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/splay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/tplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/tplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yafcdda/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yafcdda/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yafcore/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yafcore/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yafmpgplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yafmpgplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yafsplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yafsplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yaftplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yaftplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yafvorbis/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yafvorbis/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yafxplayer/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yafxplayer/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/example/yaf/yafyuv/Makefile"
++ac_config_files="$ac_config_files mpeglib/example/yaf/yafyuv/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/decoder/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/decoder/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/frame/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/frame/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/input/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/input/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/mpegplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/mpegplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/mpgplayer/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/mpgplayer/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/oggvorbis/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/oggvorbis/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/output/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/output/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/splay/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/splay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/tplay/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/tplay/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/abstract/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/abstract/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/audio/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/audio/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/file/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/file/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/mmx/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/mmx/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/render/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/render/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/render/dither/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/render/dither/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/render/dither2YUV/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/render/dither2YUV/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/render/sdl/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/render/sdl/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/util/render/x11/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/util/render/x11/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib/lib/yuv/Makefile"
++ac_config_files="$ac_config_files mpeglib/lib/yuv/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpeglib_artsplug/Makefile"
++ac_config_files="$ac_config_files mpeglib_artsplug/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpg123_artsplugin/Makefile"
++ac_config_files="$ac_config_files mpg123_artsplugin/Makefile"
+ 
+-          ac_config_files="$ac_config_files mpg123_artsplugin/mpg123/Makefile"
++ac_config_files="$ac_config_files mpg123_artsplugin/mpg123/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/Makefile"
++ac_config_files="$ac_config_files noatun/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/app/Makefile"
++ac_config_files="$ac_config_files noatun/app/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/library/Makefile"
++ac_config_files="$ac_config_files noatun/library/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/library/noatun/Makefile"
++ac_config_files="$ac_config_files noatun/library/noatun/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/library/noatunarts/Makefile"
++ac_config_files="$ac_config_files noatun/library/noatunarts/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/library/noatuntags/Makefile"
++ac_config_files="$ac_config_files noatun/library/noatuntags/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/Makefile"
++ac_config_files="$ac_config_files noatun/modules/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/artseffects/Makefile"
++ac_config_files="$ac_config_files noatun/modules/artseffects/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/dcopiface/Makefile"
++ac_config_files="$ac_config_files noatun/modules/dcopiface/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/excellent/Makefile"
++ac_config_files="$ac_config_files noatun/modules/excellent/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/htmlexport/Makefile"
++ac_config_files="$ac_config_files noatun/modules/htmlexport/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/infrared/Makefile"
++ac_config_files="$ac_config_files noatun/modules/infrared/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kaiman/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kaiman/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kaiman/skins/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kaiman/skins/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kaiman/skins/car-preset/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kaiman/skins/car-preset/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kaiman/skins/circle/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kaiman/skins/circle/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kaiman/skins/k9/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kaiman/skins/k9/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/keyz/Makefile"
++ac_config_files="$ac_config_files noatun/modules/keyz/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kjofol-skin/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kjofol-skin/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/HexoBronx/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/HexoBronx/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/kjofol/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/kjofol/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/phong/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/phong/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/vibrocentric/Makefile"
++ac_config_files="$ac_config_files noatun/modules/kjofol-skin/skins/vibrocentric/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/marquis/Makefile"
++ac_config_files="$ac_config_files noatun/modules/marquis/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/metatag/Makefile"
++ac_config_files="$ac_config_files noatun/modules/metatag/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/monoscope/Makefile"
++ac_config_files="$ac_config_files noatun/modules/monoscope/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/net/Makefile"
++ac_config_files="$ac_config_files noatun/modules/net/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/noatunui/Makefile"
++ac_config_files="$ac_config_files noatun/modules/noatunui/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/simple/Makefile"
++ac_config_files="$ac_config_files noatun/modules/simple/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/splitplaylist/Makefile"
++ac_config_files="$ac_config_files noatun/modules/splitplaylist/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/systray/Makefile"
++ac_config_files="$ac_config_files noatun/modules/systray/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/voiceprint/Makefile"
++ac_config_files="$ac_config_files noatun/modules/voiceprint/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/winskin/Makefile"
++ac_config_files="$ac_config_files noatun/modules/winskin/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/winskin/mimetypes/Makefile"
++ac_config_files="$ac_config_files noatun/modules/winskin/mimetypes/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/winskin/mimetypes/interface/Makefile"
++ac_config_files="$ac_config_files noatun/modules/winskin/mimetypes/interface/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/winskin/skins/Makefile"
++ac_config_files="$ac_config_files noatun/modules/winskin/skins/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/winskin/skins/winamp/Makefile"
++ac_config_files="$ac_config_files noatun/modules/winskin/skins/winamp/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/modules/winskin/vis/Makefile"
++ac_config_files="$ac_config_files noatun/modules/winskin/vis/Makefile"
+ 
+-          ac_config_files="$ac_config_files noatun/pics/Makefile"
++ac_config_files="$ac_config_files noatun/pics/Makefile"
+ 
+-          ac_config_files="$ac_config_files oggvorbis_artsplugin/Makefile"
++ac_config_files="$ac_config_files oggvorbis_artsplugin/Makefile"
+ 
+-          ac_config_files="$ac_config_files xine_artsplugin/Makefile"
++ac_config_files="$ac_config_files xine_artsplugin/Makefile"
+ 
+-          ac_config_files="$ac_config_files xine_artsplugin/tools/Makefile"
++ac_config_files="$ac_config_files xine_artsplugin/tools/Makefile"
+ 
+-          ac_config_files="$ac_config_files xine_artsplugin/tools/thumbnail/Makefile"
++ac_config_files="$ac_config_files xine_artsplugin/tools/thumbnail/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -43312,39 +43793,58 @@
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       # `set' does not quote correctly, so add quotes (double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    test "x$cache_file" != "x/dev/null" &&
++      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
++echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -43353,38 +43853,31 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[	 ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[	 ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++  ac_i=`echo "$ac_i" | sed "$ac_script"`
++  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
++  #    will be set to the directory where LIBOBJS objects are built.
++  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -17877,53 +36507,2984 @@
  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
-@@ -44403,6 +43848,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;t t
- s, at KDECONFIG@,$KDECONFIG,;t t
- s, at kde_libs_prefix@,$kde_libs_prefix,;t t
- s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -44876,11 +44324,6 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+@@ -43717,11 +44210,35 @@
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+ 
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+@@ -43730,8 +44247,43 @@
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -43745,18 +44297,19 @@
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+-    $as_unset $as_var
++    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -43764,159 +44317,120 @@
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
++# CDPATH.
++$as_unset CDPATH
+ 
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++  chmod +x "$as_me.lineno" ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++if (dirname -- /) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
++
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
+ esac
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir
++fi
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
++  as_ln_s='ln -s'
++  # ... but there are two gotchas:
++  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++  # In both cases, we have to default to `cp -p'.
++  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+     as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -43925,7 +44439,19 @@
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
++# systems may use methods other than mode bits to determine executability.
++cat >conf$$.file <<_ASEOF
++#! /bin/sh
++exit 0
++_ASEOF
++chmod +x conf$$.file
++if test -x conf$$.file >/dev/null 2>&1; then
++  as_executable_p="test -x"
++else
++  as_executable_p=:
++fi
++rm -f conf$$.file
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -43934,31 +44460,14 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
+ 
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# Save the log message, to keep $[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
++# values after options handling.
++ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.59d.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -43966,30 +44475,20 @@
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+ 
++cat >>$CONFIG_STATUS <<_ACEOF
+ # Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+ 
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++_ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -44016,19 +44515,21 @@
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+-_ACEOF
+ 
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
++configured by $0, generated by GNU Autoconf 2.59d,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
++
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -44039,39 +44540,24 @@
+ do
+   case $1 in
+   --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
+-  -*)
++  *)
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_option=$1
+-     ac_need_defaults=false;;
    esac
  
+   case $ac_option in
+   # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
++  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++    echo "$ac_cs_version"; exit ;;
++  --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+@@ -44081,18 +44567,24 @@
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
++  --he | --h)
++    # Conflict between --help and --header
++    { echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
++  -*) { echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; } ;;
+ 
+-  *) ac_config_targets="$ac_config_targets $1" ;;
++  *) ac_config_targets="$ac_config_targets $1"
++     ac_need_defaults=false ;;
+ 
+   esac
+   shift
+@@ -44108,201 +44600,213 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  CONFIG_SHELL=$SHELL
++  export CONFIG_SHELL
++  exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+ 
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++  echo "$ac_log"
++} >&5
+ 
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+-# INIT-COMMANDS section.
++# INIT-COMMANDS
+ #
+-
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ 
+ _ACEOF
+ 
+-
+-
+ cat >>$CONFIG_STATUS <<\_ACEOF
++
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+-  "akode_artsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES akode_artsplugin/Makefile" ;;
+-  "arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/Makefile" ;;
+-  "arts/builder/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/builder/Makefile" ;;
+-  "arts/builder/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/builder/pics/Makefile" ;;
+-  "arts/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/examples/Makefile" ;;
+-  "arts/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/gui/Makefile" ;;
+-  "arts/gui/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/gui/common/Makefile" ;;
+-  "arts/gui/kde/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/gui/kde/Makefile" ;;
+-  "arts/gui/kde/mcopclass/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/gui/kde/mcopclass/Makefile" ;;
+-  "arts/midi/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/midi/Makefile" ;;
+-  "arts/midi/mcopclass/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/midi/mcopclass/Makefile" ;;
+-  "arts/modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/modules/Makefile" ;;
+-  "arts/modules/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/modules/common/Makefile" ;;
+-  "arts/modules/effects/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/modules/effects/Makefile" ;;
+-  "arts/modules/effects/freeverb/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/modules/effects/freeverb/Makefile" ;;
+-  "arts/modules/mixers/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/modules/mixers/Makefile" ;;
+-  "arts/modules/synth/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/modules/synth/Makefile" ;;
+-  "arts/runtime/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/runtime/Makefile" ;;
+-  "arts/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/tools/Makefile" ;;
+-  "arts/tools/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES arts/tools/pics/Makefile" ;;
+-  "audiofile_artsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES audiofile_artsplugin/Makefile" ;;
+-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+-  "doc/artsbuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/artsbuilder/Makefile" ;;
+-  "doc/artsbuilder/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/artsbuilder/images/Makefile" ;;
+-  "doc/juk/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/juk/Makefile" ;;
+-  "doc/kaboodle/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kaboodle/Makefile" ;;
+-  "doc/kaudiocreator/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kaudiocreator/Makefile" ;;
+-  "doc/kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kioslave/Makefile" ;;
+-  "doc/kmid/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kmid/Makefile" ;;
+-  "doc/kmix/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kmix/Makefile" ;;
+-  "doc/krec/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/krec/Makefile" ;;
+-  "doc/kscd/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kscd/Makefile" ;;
+-  "doc/noatun/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/noatun/Makefile" ;;
+-  "juk/Makefile" ) CONFIG_FILES="$CONFIG_FILES juk/Makefile" ;;
+-  "juk/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES juk/pics/Makefile" ;;
+-  "kaboodle/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaboodle/Makefile" ;;
+-  "kaboodle/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaboodle/actions/Makefile" ;;
+-  "kaboodle/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaboodle/pics/Makefile" ;;
+-  "kappfinder-data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder-data/Makefile" ;;
+-  "kaudiocreator/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaudiocreator/Makefile" ;;
+-  "kaudiocreator/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kaudiocreator/icons/Makefile" ;;
+-  "kfile-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/Makefile" ;;
+-  "kfile-plugins/au/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/au/Makefile" ;;
+-  "kfile-plugins/avi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/avi/Makefile" ;;
+-  "kfile-plugins/flac/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/flac/Makefile" ;;
+-  "kfile-plugins/m3u/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/m3u/Makefile" ;;
+-  "kfile-plugins/mp3/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/mp3/Makefile" ;;
+-  "kfile-plugins/mpc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/mpc/Makefile" ;;
+-  "kfile-plugins/mpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/mpeg/Makefile" ;;
+-  "kfile-plugins/ogg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/ogg/Makefile" ;;
+-  "kfile-plugins/sid/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/sid/Makefile" ;;
+-  "kfile-plugins/theora/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/theora/Makefile" ;;
+-  "kfile-plugins/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfile-plugins/wav/Makefile" ;;
+-  "kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/Makefile" ;;
+-  "kioslave/audiocd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/Makefile" ;;
+-  "kioslave/audiocd/kcmaudiocd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/kcmaudiocd/Makefile" ;;
+-  "kioslave/audiocd/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/Makefile" ;;
+-  "kioslave/audiocd/plugins/flac/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/flac/Makefile" ;;
+-  "kioslave/audiocd/plugins/lame/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/lame/Makefile" ;;
+-  "kioslave/audiocd/plugins/vorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/vorbis/Makefile" ;;
+-  "kioslave/audiocd/plugins/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/wav/Makefile" ;;
+-  "kmid/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmid/Makefile" ;;
+-  "kmid/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmid/examples/Makefile" ;;
+-  "kmid/maps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmid/maps/Makefile" ;;
+-  "kmid/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmid/pics/Makefile" ;;
+-  "kmix/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmix/Makefile" ;;
+-  "kmix/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmix/pics/Makefile" ;;
+-  "krec/Makefile" ) CONFIG_FILES="$CONFIG_FILES krec/Makefile" ;;
+-  "krec/mp3_export/Makefile" ) CONFIG_FILES="$CONFIG_FILES krec/mp3_export/Makefile" ;;
+-  "krec/ogg_export/Makefile" ) CONFIG_FILES="$CONFIG_FILES krec/ogg_export/Makefile" ;;
+-  "krec/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES krec/pics/Makefile" ;;
+-  "kscd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscd/Makefile" ;;
+-  "kscd/bitmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscd/bitmaps/Makefile" ;;
+-  "kscd/kscdmagic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscd/kscdmagic/Makefile" ;;
+-  "kscd/libwm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscd/libwm/Makefile" ;;
+-  "kscd/libwm/audio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscd/libwm/audio/Makefile" ;;
+-  "libkcddb/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkcddb/Makefile" ;;
+-  "libkcddb/kcmcddb/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkcddb/kcmcddb/Makefile" ;;
+-  "libkcddb/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkcddb/test/Makefile" ;;
+-  "mpeglib/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/Makefile" ;;
+-  "mpeglib/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/Makefile" ;;
+-  "mpeglib/example/cddaplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/cddaplay/Makefile" ;;
+-  "mpeglib/example/mpgplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/mpgplay/Makefile" ;;
+-  "mpeglib/example/splay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/splay/Makefile" ;;
+-  "mpeglib/example/tplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/tplay/Makefile" ;;
+-  "mpeglib/example/yaf/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/Makefile" ;;
+-  "mpeglib/example/yaf/yafcdda/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafcdda/Makefile" ;;
+-  "mpeglib/example/yaf/yafcore/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafcore/Makefile" ;;
+-  "mpeglib/example/yaf/yafmpgplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafmpgplay/Makefile" ;;
+-  "mpeglib/example/yaf/yafsplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafsplay/Makefile" ;;
+-  "mpeglib/example/yaf/yaftplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yaftplay/Makefile" ;;
+-  "mpeglib/example/yaf/yafvorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafvorbis/Makefile" ;;
+-  "mpeglib/example/yaf/yafxplayer/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafxplayer/Makefile" ;;
+-  "mpeglib/example/yaf/yafyuv/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafyuv/Makefile" ;;
+-  "mpeglib/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/Makefile" ;;
+-  "mpeglib/lib/decoder/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/decoder/Makefile" ;;
+-  "mpeglib/lib/frame/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/frame/Makefile" ;;
+-  "mpeglib/lib/input/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/input/Makefile" ;;
+-  "mpeglib/lib/mpegplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/mpegplay/Makefile" ;;
+-  "mpeglib/lib/mpgplayer/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/mpgplayer/Makefile" ;;
+-  "mpeglib/lib/oggvorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/oggvorbis/Makefile" ;;
+-  "mpeglib/lib/output/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/output/Makefile" ;;
+-  "mpeglib/lib/splay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/splay/Makefile" ;;
+-  "mpeglib/lib/tplay/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/tplay/Makefile" ;;
+-  "mpeglib/lib/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/Makefile" ;;
+-  "mpeglib/lib/util/abstract/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/abstract/Makefile" ;;
+-  "mpeglib/lib/util/audio/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/audio/Makefile" ;;
+-  "mpeglib/lib/util/file/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/file/Makefile" ;;
+-  "mpeglib/lib/util/mmx/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/mmx/Makefile" ;;
+-  "mpeglib/lib/util/render/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/Makefile" ;;
+-  "mpeglib/lib/util/render/dither/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/dither/Makefile" ;;
+-  "mpeglib/lib/util/render/dither2YUV/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/dither2YUV/Makefile" ;;
+-  "mpeglib/lib/util/render/sdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/sdl/Makefile" ;;
+-  "mpeglib/lib/util/render/x11/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/x11/Makefile" ;;
+-  "mpeglib/lib/yuv/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib/lib/yuv/Makefile" ;;
+-  "mpeglib_artsplug/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpeglib_artsplug/Makefile" ;;
+-  "mpg123_artsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpg123_artsplugin/Makefile" ;;
+-  "mpg123_artsplugin/mpg123/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpg123_artsplugin/mpg123/Makefile" ;;
+-  "noatun/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/Makefile" ;;
+-  "noatun/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/app/Makefile" ;;
+-  "noatun/library/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/library/Makefile" ;;
+-  "noatun/library/noatun/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/library/noatun/Makefile" ;;
+-  "noatun/library/noatunarts/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/library/noatunarts/Makefile" ;;
+-  "noatun/library/noatuntags/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/library/noatuntags/Makefile" ;;
+-  "noatun/modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/Makefile" ;;
+-  "noatun/modules/artseffects/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/artseffects/Makefile" ;;
+-  "noatun/modules/dcopiface/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/dcopiface/Makefile" ;;
+-  "noatun/modules/excellent/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/excellent/Makefile" ;;
+-  "noatun/modules/htmlexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/htmlexport/Makefile" ;;
+-  "noatun/modules/infrared/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/infrared/Makefile" ;;
+-  "noatun/modules/kaiman/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/Makefile" ;;
+-  "noatun/modules/kaiman/skins/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/Makefile" ;;
+-  "noatun/modules/kaiman/skins/car-preset/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/car-preset/Makefile" ;;
+-  "noatun/modules/kaiman/skins/circle/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/circle/Makefile" ;;
+-  "noatun/modules/kaiman/skins/k9/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/k9/Makefile" ;;
+-  "noatun/modules/keyz/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/keyz/Makefile" ;;
+-  "noatun/modules/kjofol-skin/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/Makefile" ;;
+-  "noatun/modules/kjofol-skin/skins/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/Makefile" ;;
+-  "noatun/modules/kjofol-skin/skins/HexoBronx/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/HexoBronx/Makefile" ;;
+-  "noatun/modules/kjofol-skin/skins/kjofol/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/kjofol/Makefile" ;;
+-  "noatun/modules/kjofol-skin/skins/phong/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/phong/Makefile" ;;
+-  "noatun/modules/kjofol-skin/skins/vibrocentric/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/vibrocentric/Makefile" ;;
+-  "noatun/modules/marquis/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/marquis/Makefile" ;;
+-  "noatun/modules/metatag/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/metatag/Makefile" ;;
+-  "noatun/modules/monoscope/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/monoscope/Makefile" ;;
+-  "noatun/modules/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/net/Makefile" ;;
+-  "noatun/modules/noatunui/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/noatunui/Makefile" ;;
+-  "noatun/modules/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/simple/Makefile" ;;
+-  "noatun/modules/splitplaylist/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/splitplaylist/Makefile" ;;
+-  "noatun/modules/systray/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/systray/Makefile" ;;
+-  "noatun/modules/voiceprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/voiceprint/Makefile" ;;
+-  "noatun/modules/winskin/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/Makefile" ;;
+-  "noatun/modules/winskin/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/mimetypes/Makefile" ;;
+-  "noatun/modules/winskin/mimetypes/interface/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/mimetypes/interface/Makefile" ;;
+-  "noatun/modules/winskin/skins/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/skins/Makefile" ;;
+-  "noatun/modules/winskin/skins/winamp/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/skins/winamp/Makefile" ;;
+-  "noatun/modules/winskin/vis/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/vis/Makefile" ;;
+-  "noatun/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES noatun/pics/Makefile" ;;
+-  "oggvorbis_artsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES oggvorbis_artsplugin/Makefile" ;;
+-  "xine_artsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES xine_artsplugin/Makefile" ;;
+-  "xine_artsplugin/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES xine_artsplugin/tools/Makefile" ;;
+-  "xine_artsplugin/tools/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES xine_artsplugin/tools/thumbnail/Makefile" ;;
+-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++  case $ac_config_target in
++    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
++    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++    "akode_artsplugin/Makefile") CONFIG_FILES="$CONFIG_FILES akode_artsplugin/Makefile" ;;
++    "arts/Makefile") CONFIG_FILES="$CONFIG_FILES arts/Makefile" ;;
++    "arts/builder/Makefile") CONFIG_FILES="$CONFIG_FILES arts/builder/Makefile" ;;
++    "arts/builder/pics/Makefile") CONFIG_FILES="$CONFIG_FILES arts/builder/pics/Makefile" ;;
++    "arts/examples/Makefile") CONFIG_FILES="$CONFIG_FILES arts/examples/Makefile" ;;
++    "arts/gui/Makefile") CONFIG_FILES="$CONFIG_FILES arts/gui/Makefile" ;;
++    "arts/gui/common/Makefile") CONFIG_FILES="$CONFIG_FILES arts/gui/common/Makefile" ;;
++    "arts/gui/kde/Makefile") CONFIG_FILES="$CONFIG_FILES arts/gui/kde/Makefile" ;;
++    "arts/gui/kde/mcopclass/Makefile") CONFIG_FILES="$CONFIG_FILES arts/gui/kde/mcopclass/Makefile" ;;
++    "arts/midi/Makefile") CONFIG_FILES="$CONFIG_FILES arts/midi/Makefile" ;;
++    "arts/midi/mcopclass/Makefile") CONFIG_FILES="$CONFIG_FILES arts/midi/mcopclass/Makefile" ;;
++    "arts/modules/Makefile") CONFIG_FILES="$CONFIG_FILES arts/modules/Makefile" ;;
++    "arts/modules/common/Makefile") CONFIG_FILES="$CONFIG_FILES arts/modules/common/Makefile" ;;
++    "arts/modules/effects/Makefile") CONFIG_FILES="$CONFIG_FILES arts/modules/effects/Makefile" ;;
++    "arts/modules/effects/freeverb/Makefile") CONFIG_FILES="$CONFIG_FILES arts/modules/effects/freeverb/Makefile" ;;
++    "arts/modules/mixers/Makefile") CONFIG_FILES="$CONFIG_FILES arts/modules/mixers/Makefile" ;;
++    "arts/modules/synth/Makefile") CONFIG_FILES="$CONFIG_FILES arts/modules/synth/Makefile" ;;
++    "arts/runtime/Makefile") CONFIG_FILES="$CONFIG_FILES arts/runtime/Makefile" ;;
++    "arts/tools/Makefile") CONFIG_FILES="$CONFIG_FILES arts/tools/Makefile" ;;
++    "arts/tools/pics/Makefile") CONFIG_FILES="$CONFIG_FILES arts/tools/pics/Makefile" ;;
++    "audiofile_artsplugin/Makefile") CONFIG_FILES="$CONFIG_FILES audiofile_artsplugin/Makefile" ;;
++    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++    "doc/artsbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES doc/artsbuilder/Makefile" ;;
++    "doc/artsbuilder/images/Makefile") CONFIG_FILES="$CONFIG_FILES doc/artsbuilder/images/Makefile" ;;
++    "doc/juk/Makefile") CONFIG_FILES="$CONFIG_FILES doc/juk/Makefile" ;;
++    "doc/kaboodle/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kaboodle/Makefile" ;;
++    "doc/kaudiocreator/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kaudiocreator/Makefile" ;;
++    "doc/kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kioslave/Makefile" ;;
++    "doc/kmid/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kmid/Makefile" ;;
++    "doc/kmix/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kmix/Makefile" ;;
++    "doc/krec/Makefile") CONFIG_FILES="$CONFIG_FILES doc/krec/Makefile" ;;
++    "doc/kscd/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kscd/Makefile" ;;
++    "doc/noatun/Makefile") CONFIG_FILES="$CONFIG_FILES doc/noatun/Makefile" ;;
++    "juk/Makefile") CONFIG_FILES="$CONFIG_FILES juk/Makefile" ;;
++    "juk/pics/Makefile") CONFIG_FILES="$CONFIG_FILES juk/pics/Makefile" ;;
++    "kaboodle/Makefile") CONFIG_FILES="$CONFIG_FILES kaboodle/Makefile" ;;
++    "kaboodle/actions/Makefile") CONFIG_FILES="$CONFIG_FILES kaboodle/actions/Makefile" ;;
++    "kaboodle/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kaboodle/pics/Makefile" ;;
++    "kappfinder-data/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder-data/Makefile" ;;
++    "kaudiocreator/Makefile") CONFIG_FILES="$CONFIG_FILES kaudiocreator/Makefile" ;;
++    "kaudiocreator/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kaudiocreator/icons/Makefile" ;;
++    "kfile-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/Makefile" ;;
++    "kfile-plugins/au/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/au/Makefile" ;;
++    "kfile-plugins/avi/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/avi/Makefile" ;;
++    "kfile-plugins/flac/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/flac/Makefile" ;;
++    "kfile-plugins/m3u/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/m3u/Makefile" ;;
++    "kfile-plugins/mp3/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/mp3/Makefile" ;;
++    "kfile-plugins/mpc/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/mpc/Makefile" ;;
++    "kfile-plugins/mpeg/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/mpeg/Makefile" ;;
++    "kfile-plugins/ogg/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/ogg/Makefile" ;;
++    "kfile-plugins/sid/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/sid/Makefile" ;;
++    "kfile-plugins/theora/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/theora/Makefile" ;;
++    "kfile-plugins/wav/Makefile") CONFIG_FILES="$CONFIG_FILES kfile-plugins/wav/Makefile" ;;
++    "kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/Makefile" ;;
++    "kioslave/audiocd/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/Makefile" ;;
++    "kioslave/audiocd/kcmaudiocd/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/kcmaudiocd/Makefile" ;;
++    "kioslave/audiocd/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/Makefile" ;;
++    "kioslave/audiocd/plugins/flac/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/flac/Makefile" ;;
++    "kioslave/audiocd/plugins/lame/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/lame/Makefile" ;;
++    "kioslave/audiocd/plugins/vorbis/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/vorbis/Makefile" ;;
++    "kioslave/audiocd/plugins/wav/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/audiocd/plugins/wav/Makefile" ;;
++    "kmid/Makefile") CONFIG_FILES="$CONFIG_FILES kmid/Makefile" ;;
++    "kmid/examples/Makefile") CONFIG_FILES="$CONFIG_FILES kmid/examples/Makefile" ;;
++    "kmid/maps/Makefile") CONFIG_FILES="$CONFIG_FILES kmid/maps/Makefile" ;;
++    "kmid/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kmid/pics/Makefile" ;;
++    "kmix/Makefile") CONFIG_FILES="$CONFIG_FILES kmix/Makefile" ;;
++    "kmix/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kmix/pics/Makefile" ;;
++    "krec/Makefile") CONFIG_FILES="$CONFIG_FILES krec/Makefile" ;;
++    "krec/mp3_export/Makefile") CONFIG_FILES="$CONFIG_FILES krec/mp3_export/Makefile" ;;
++    "krec/ogg_export/Makefile") CONFIG_FILES="$CONFIG_FILES krec/ogg_export/Makefile" ;;
++    "krec/pics/Makefile") CONFIG_FILES="$CONFIG_FILES krec/pics/Makefile" ;;
++    "kscd/Makefile") CONFIG_FILES="$CONFIG_FILES kscd/Makefile" ;;
++    "kscd/bitmaps/Makefile") CONFIG_FILES="$CONFIG_FILES kscd/bitmaps/Makefile" ;;
++    "kscd/kscdmagic/Makefile") CONFIG_FILES="$CONFIG_FILES kscd/kscdmagic/Makefile" ;;
++    "kscd/libwm/Makefile") CONFIG_FILES="$CONFIG_FILES kscd/libwm/Makefile" ;;
++    "kscd/libwm/audio/Makefile") CONFIG_FILES="$CONFIG_FILES kscd/libwm/audio/Makefile" ;;
++    "libkcddb/Makefile") CONFIG_FILES="$CONFIG_FILES libkcddb/Makefile" ;;
++    "libkcddb/kcmcddb/Makefile") CONFIG_FILES="$CONFIG_FILES libkcddb/kcmcddb/Makefile" ;;
++    "libkcddb/test/Makefile") CONFIG_FILES="$CONFIG_FILES libkcddb/test/Makefile" ;;
++    "mpeglib/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/Makefile" ;;
++    "mpeglib/example/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/Makefile" ;;
++    "mpeglib/example/cddaplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/cddaplay/Makefile" ;;
++    "mpeglib/example/mpgplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/mpgplay/Makefile" ;;
++    "mpeglib/example/splay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/splay/Makefile" ;;
++    "mpeglib/example/tplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/tplay/Makefile" ;;
++    "mpeglib/example/yaf/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/Makefile" ;;
++    "mpeglib/example/yaf/yafcdda/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafcdda/Makefile" ;;
++    "mpeglib/example/yaf/yafcore/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafcore/Makefile" ;;
++    "mpeglib/example/yaf/yafmpgplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafmpgplay/Makefile" ;;
++    "mpeglib/example/yaf/yafsplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafsplay/Makefile" ;;
++    "mpeglib/example/yaf/yaftplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yaftplay/Makefile" ;;
++    "mpeglib/example/yaf/yafvorbis/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafvorbis/Makefile" ;;
++    "mpeglib/example/yaf/yafxplayer/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafxplayer/Makefile" ;;
++    "mpeglib/example/yaf/yafyuv/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/example/yaf/yafyuv/Makefile" ;;
++    "mpeglib/lib/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/Makefile" ;;
++    "mpeglib/lib/decoder/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/decoder/Makefile" ;;
++    "mpeglib/lib/frame/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/frame/Makefile" ;;
++    "mpeglib/lib/input/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/input/Makefile" ;;
++    "mpeglib/lib/mpegplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/mpegplay/Makefile" ;;
++    "mpeglib/lib/mpgplayer/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/mpgplayer/Makefile" ;;
++    "mpeglib/lib/oggvorbis/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/oggvorbis/Makefile" ;;
++    "mpeglib/lib/output/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/output/Makefile" ;;
++    "mpeglib/lib/splay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/splay/Makefile" ;;
++    "mpeglib/lib/tplay/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/tplay/Makefile" ;;
++    "mpeglib/lib/util/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/Makefile" ;;
++    "mpeglib/lib/util/abstract/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/abstract/Makefile" ;;
++    "mpeglib/lib/util/audio/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/audio/Makefile" ;;
++    "mpeglib/lib/util/file/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/file/Makefile" ;;
++    "mpeglib/lib/util/mmx/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/mmx/Makefile" ;;
++    "mpeglib/lib/util/render/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/Makefile" ;;
++    "mpeglib/lib/util/render/dither/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/dither/Makefile" ;;
++    "mpeglib/lib/util/render/dither2YUV/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/dither2YUV/Makefile" ;;
++    "mpeglib/lib/util/render/sdl/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/sdl/Makefile" ;;
++    "mpeglib/lib/util/render/x11/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/util/render/x11/Makefile" ;;
++    "mpeglib/lib/yuv/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib/lib/yuv/Makefile" ;;
++    "mpeglib_artsplug/Makefile") CONFIG_FILES="$CONFIG_FILES mpeglib_artsplug/Makefile" ;;
++    "mpg123_artsplugin/Makefile") CONFIG_FILES="$CONFIG_FILES mpg123_artsplugin/Makefile" ;;
++    "mpg123_artsplugin/mpg123/Makefile") CONFIG_FILES="$CONFIG_FILES mpg123_artsplugin/mpg123/Makefile" ;;
++    "noatun/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/Makefile" ;;
++    "noatun/app/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/app/Makefile" ;;
++    "noatun/library/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/library/Makefile" ;;
++    "noatun/library/noatun/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/library/noatun/Makefile" ;;
++    "noatun/library/noatunarts/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/library/noatunarts/Makefile" ;;
++    "noatun/library/noatuntags/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/library/noatuntags/Makefile" ;;
++    "noatun/modules/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/Makefile" ;;
++    "noatun/modules/artseffects/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/artseffects/Makefile" ;;
++    "noatun/modules/dcopiface/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/dcopiface/Makefile" ;;
++    "noatun/modules/excellent/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/excellent/Makefile" ;;
++    "noatun/modules/htmlexport/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/htmlexport/Makefile" ;;
++    "noatun/modules/infrared/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/infrared/Makefile" ;;
++    "noatun/modules/kaiman/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/Makefile" ;;
++    "noatun/modules/kaiman/skins/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/Makefile" ;;
++    "noatun/modules/kaiman/skins/car-preset/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/car-preset/Makefile" ;;
++    "noatun/modules/kaiman/skins/circle/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/circle/Makefile" ;;
++    "noatun/modules/kaiman/skins/k9/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kaiman/skins/k9/Makefile" ;;
++    "noatun/modules/keyz/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/keyz/Makefile" ;;
++    "noatun/modules/kjofol-skin/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/Makefile" ;;
++    "noatun/modules/kjofol-skin/skins/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/Makefile" ;;
++    "noatun/modules/kjofol-skin/skins/HexoBronx/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/HexoBronx/Makefile" ;;
++    "noatun/modules/kjofol-skin/skins/kjofol/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/kjofol/Makefile" ;;
++    "noatun/modules/kjofol-skin/skins/phong/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/phong/Makefile" ;;
++    "noatun/modules/kjofol-skin/skins/vibrocentric/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/kjofol-skin/skins/vibrocentric/Makefile" ;;
++    "noatun/modules/marquis/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/marquis/Makefile" ;;
++    "noatun/modules/metatag/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/metatag/Makefile" ;;
++    "noatun/modules/monoscope/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/monoscope/Makefile" ;;
++    "noatun/modules/net/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/net/Makefile" ;;
++    "noatun/modules/noatunui/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/noatunui/Makefile" ;;
++    "noatun/modules/simple/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/simple/Makefile" ;;
++    "noatun/modules/splitplaylist/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/splitplaylist/Makefile" ;;
++    "noatun/modules/systray/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/systray/Makefile" ;;
++    "noatun/modules/voiceprint/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/voiceprint/Makefile" ;;
++    "noatun/modules/winskin/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/Makefile" ;;
++    "noatun/modules/winskin/mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/mimetypes/Makefile" ;;
++    "noatun/modules/winskin/mimetypes/interface/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/mimetypes/interface/Makefile" ;;
++    "noatun/modules/winskin/skins/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/skins/Makefile" ;;
++    "noatun/modules/winskin/skins/winamp/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/skins/winamp/Makefile" ;;
++    "noatun/modules/winskin/vis/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/modules/winskin/vis/Makefile" ;;
++    "noatun/pics/Makefile") CONFIG_FILES="$CONFIG_FILES noatun/pics/Makefile" ;;
++    "oggvorbis_artsplugin/Makefile") CONFIG_FILES="$CONFIG_FILES oggvorbis_artsplugin/Makefile" ;;
++    "xine_artsplugin/Makefile") CONFIG_FILES="$CONFIG_FILES xine_artsplugin/Makefile" ;;
++    "xine_artsplugin/tools/Makefile") CONFIG_FILES="$CONFIG_FILES xine_artsplugin/tools/Makefile" ;;
++    "xine_artsplugin/tools/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES xine_artsplugin/tools/thumbnail/Makefile" ;;
++
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
++
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+@@ -44314,625 +44818,817 @@
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  tmp=
++  trap 'exit_status=$?
++  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=./confstat$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
++  tmp=./conf$$-$RANDOM
++  (umask 077 && mkdir "$tmp")
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+-_ACEOF
+-
+-cat >>$CONFIG_STATUS <<_ACEOF
+-
+ #
+-# CONFIG_FILES section.
++# Set up the sed scripts for CONFIG_FILES section.
+ #
+ 
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s, at SHELL@,$SHELL,;t t
+-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s, at exec_prefix@,$exec_prefix,;t t
+-s, at prefix@,$prefix,;t t
+-s, at program_transform_name@,$program_transform_name,;t t
+-s, at bindir@,$bindir,;t t
+-s, at sbindir@,$sbindir,;t t
+-s, at libexecdir@,$libexecdir,;t t
+-s, at datadir@,$datadir,;t t
+-s, at sysconfdir@,$sysconfdir,;t t
+-s, at sharedstatedir@,$sharedstatedir,;t t
+-s, at localstatedir@,$localstatedir,;t t
+-s, at libdir@,$libdir,;t t
+-s, at includedir@,$includedir,;t t
+-s, at oldincludedir@,$oldincludedir,;t t
+-s, at infodir@,$infodir,;t t
+-s, at mandir@,$mandir,;t t
+-s, at build_alias@,$build_alias,;t t
+-s, at host_alias@,$host_alias,;t t
+-s, at target_alias@,$target_alias,;t t
+-s, at DEFS@,$DEFS,;t t
+-s, at ECHO_C@,$ECHO_C,;t t
+-s, at ECHO_N@,$ECHO_N,;t t
+-s, at ECHO_T@,$ECHO_T,;t t
+-s, at LIBS@,$LIBS,;t t
+-s, at build@,$build,;t t
+-s, at build_cpu@,$build_cpu,;t t
+-s, at build_vendor@,$build_vendor,;t t
+-s, at build_os@,$build_os,;t t
+-s, at host@,$host,;t t
+-s, at host_cpu@,$host_cpu,;t t
+-s, at host_vendor@,$host_vendor,;t t
+-s, at host_os@,$host_os,;t t
+-s, at target@,$target,;t t
+-s, at target_cpu@,$target_cpu,;t t
+-s, at target_vendor@,$target_vendor,;t t
+-s, at target_os@,$target_os,;t t
+-s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+-s, at CYGPATH_W@,$CYGPATH_W,;t t
+-s, at PACKAGE@,$PACKAGE,;t t
+-s, at VERSION@,$VERSION,;t t
+-s, at ACLOCAL@,$ACLOCAL,;t t
+-s, at AUTOCONF@,$AUTOCONF,;t t
+-s, at AUTOMAKE@,$AUTOMAKE,;t t
+-s, at AUTOHEADER@,$AUTOHEADER,;t t
+-s, at MAKEINFO@,$MAKEINFO,;t t
+-s, at install_sh@,$install_sh,;t t
+-s, at STRIP@,$STRIP,;t t
+-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s, at mkdir_p@,$mkdir_p,;t t
+-s, at AWK@,$AWK,;t t
+-s, at SET_MAKE@,$SET_MAKE,;t t
+-s, at am__leading_dot@,$am__leading_dot,;t t
+-s, at AMTAR@,$AMTAR,;t t
+-s, at am__tar@,$am__tar,;t t
+-s, at am__untar@,$am__untar,;t t
+-s, at KDECONFIG@,$KDECONFIG,;t t
+-s, at kde_libs_prefix@,$kde_libs_prefix,;t t
+-s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
+-s, at CONF_FILES@,$CONF_FILES,;t t
+-s, at CC@,$CC,;t t
+-s, at CFLAGS@,$CFLAGS,;t t
+-s, at LDFLAGS@,$LDFLAGS,;t t
+-s, at CPPFLAGS@,$CPPFLAGS,;t t
+-s, at ac_ct_CC@,$ac_ct_CC,;t t
+-s, at EXEEXT@,$EXEEXT,;t t
+-s, at OBJEXT@,$OBJEXT,;t t
+-s, at DEPDIR@,$DEPDIR,;t t
+-s, at am__include@,$am__include,;t t
+-s, at am__quote@,$am__quote,;t t
+-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s, at CCDEPMODE@,$CCDEPMODE,;t t
+-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s, at CPP@,$CPP,;t t
+-s, at CXX@,$CXX,;t t
+-s, at CXXFLAGS@,$CXXFLAGS,;t t
+-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
+-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
+-s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+-s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
+-s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
+-s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
+-s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
+-s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
+-s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
+-s, at USE_RTTI@,$USE_RTTI,;t t
+-s, at CXXCPP@,$CXXCPP,;t t
+-s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
+-s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
+-s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
+-s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
+-s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
+-s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
+-s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
+-s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
+-s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
+-s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
+-s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
+-s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
+-s, at EGREP@,$EGREP,;t t
+-s, at LN_S@,$LN_S,;t t
+-s, at ECHO@,$ECHO,;t t
+-s, at AR@,$AR,;t t
+-s, at ac_ct_AR@,$ac_ct_AR,;t t
+-s, at RANLIB@,$RANLIB,;t t
+-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s, at F77@,$F77,;t t
+-s, at FFLAGS@,$FFLAGS,;t t
+-s, at ac_ct_F77@,$ac_ct_F77,;t t
+-s, at LIBTOOL@,$LIBTOOL,;t t
+-s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
+-s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
+-s, at MSGFMT@,$MSGFMT,;t t
+-s, at GMSGFMT@,$GMSGFMT,;t t
+-s, at XGETTEXT@,$XGETTEXT,;t t
+-s, at LIBUTIL@,$LIBUTIL,;t t
+-s, at LIBCOMPAT@,$LIBCOMPAT,;t t
+-s, at LIBCRYPT@,$LIBCRYPT,;t t
+-s, at LIBRESOLV@,$LIBRESOLV,;t t
+-s, at LIB_POLL@,$LIB_POLL,;t t
+-s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
+-s, at LIBSOCKET@,$LIBSOCKET,;t t
+-s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+-s, at LIBUCB@,$LIBUCB,;t t
+-s, at LIBDL@,$LIBDL,;t t
+-s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
+-s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
+-s, at include_x11_TRUE@,$include_x11_TRUE,;t t
+-s, at include_x11_FALSE@,$include_x11_FALSE,;t t
+-s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
+-s, at LIB_X11@,$LIB_X11,;t t
+-s, at LIB_XRENDER@,$LIB_XRENDER,;t t
+-s, at LIBSM@,$LIBSM,;t t
+-s, at X_INCLUDES@,$X_INCLUDES,;t t
+-s, at X_LDFLAGS@,$X_LDFLAGS,;t t
+-s, at x_includes@,$x_includes,;t t
+-s, at x_libraries@,$x_libraries,;t t
+-s, at QTE_NORTTI@,$QTE_NORTTI,;t t
+-s, at LIB_XEXT@,$LIB_XEXT,;t t
+-s, at LIBPTHREAD@,$LIBPTHREAD,;t t
+-s, at USE_THREADS@,$USE_THREADS,;t t
+-s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
+-s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
+-s, at USER_INCLUDES@,$USER_INCLUDES,;t t
+-s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
+-s, at LIBZ@,$LIBZ,;t t
+-s, at LIBPNG@,$LIBPNG,;t t
+-s, at LIBJPEG@,$LIBJPEG,;t t
+-s, at qt_libraries@,$qt_libraries,;t t
+-s, at qt_includes@,$qt_includes,;t t
+-s, at QT_INCLUDES@,$QT_INCLUDES,;t t
+-s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
+-s, at PERL@,$PERL,;t t
+-s, at MOC@,$MOC,;t t
+-s, at UIC@,$UIC,;t t
+-s, at UIC_TR@,$UIC_TR,;t t
+-s, at LIB_QT@,$LIB_QT,;t t
+-s, at LIB_QPE@,$LIB_QPE,;t t
+-s, at kde_qtver@,$kde_qtver,;t t
+-s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
+-s, at KDE_RPATH@,$KDE_RPATH,;t t
+-s, at X_RPATH@,$X_RPATH,;t t
+-s, at kde_libraries@,$kde_libraries,;t t
+-s, at kde_includes@,$kde_includes,;t t
+-s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
+-s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
+-s, at all_includes@,$all_includes,;t t
+-s, at all_libraries@,$all_libraries,;t t
+-s, at AUTODIRS@,$AUTODIRS,;t t
+-s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
+-s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
+-s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
+-s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
+-s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
+-s, at DCOPIDLNG@,$DCOPIDLNG,;t t
+-s, at DCOPIDL@,$DCOPIDL,;t t
+-s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
+-s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
+-s, at MCOPIDL@,$MCOPIDL,;t t
+-s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
+-s, at MEINPROC@,$MEINPROC,;t t
+-s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
+-s, at XMLLINT@,$XMLLINT,;t t
+-s, at kde_htmldir@,$kde_htmldir,;t t
+-s, at kde_appsdir@,$kde_appsdir,;t t
+-s, at kde_icondir@,$kde_icondir,;t t
+-s, at kde_sounddir@,$kde_sounddir,;t t
+-s, at kde_datadir@,$kde_datadir,;t t
+-s, at kde_locale@,$kde_locale,;t t
+-s, at kde_confdir@,$kde_confdir,;t t
+-s, at kde_kcfgdir@,$kde_kcfgdir,;t t
+-s, at kde_mimedir@,$kde_mimedir,;t t
+-s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
+-s, at kde_bindir@,$kde_bindir,;t t
+-s, at xdg_appsdir@,$xdg_appsdir,;t t
+-s, at xdg_menudir@,$xdg_menudir,;t t
+-s, at xdg_directorydir@,$xdg_directorydir,;t t
+-s, at kde_templatesdir@,$kde_templatesdir,;t t
+-s, at kde_servicesdir@,$kde_servicesdir,;t t
+-s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
+-s, at kde_moduledir@,$kde_moduledir,;t t
+-s, at kdeinitdir@,$kdeinitdir,;t t
+-s, at kde_styledir@,$kde_styledir,;t t
+-s, at kde_widgetdir@,$kde_widgetdir,;t t
+-s, at LIB_KDED@,$LIB_KDED,;t t
+-s, at LIB_KDECORE@,$LIB_KDECORE,;t t
+-s, at LIB_KDEUI@,$LIB_KDEUI,;t t
+-s, at LIB_KIO@,$LIB_KIO,;t t
+-s, at LIB_KJS@,$LIB_KJS,;t t
+-s, at LIB_SMB@,$LIB_SMB,;t t
+-s, at LIB_KAB@,$LIB_KAB,;t t
+-s, at LIB_KABC@,$LIB_KABC,;t t
+-s, at LIB_KHTML@,$LIB_KHTML,;t t
+-s, at LIB_KSPELL@,$LIB_KSPELL,;t t
+-s, at LIB_KPARTS@,$LIB_KPARTS,;t t
+-s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
+-s, at LIB_KUTILS@,$LIB_KUTILS,;t t
+-s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
+-s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
+-s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
+-s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
+-s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
+-s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
+-s, at LIB_KFILE@,$LIB_KFILE,;t t
+-s, at LIB_KFM@,$LIB_KFM,;t t
+-s, at ARCH_TYPE@,$ARCH_TYPE,;t t
+-s, at VORBIS_LIBS@,$VORBIS_LIBS,;t t
+-s, at VORBISFILE_LIBS@,$VORBISFILE_LIBS,;t t
+-s, at VORBISENC_LIBS@,$VORBISENC_LIBS,;t t
+-s, at compile_ogg_export_TRUE@,$compile_ogg_export_TRUE,;t t
+-s, at compile_ogg_export_FALSE@,$compile_ogg_export_FALSE,;t t
+-s, at LIBOSSAUDIO@,$LIBOSSAUDIO,;t t
+-s, at LIBASOUND@,$LIBASOUND,;t t
+-s, at ARTS_LIBASOUND@,$ARTS_LIBASOUND,;t t
+-s, at CDPARANOIA_LIBS@,$CDPARANOIA_LIBS,;t t
+-s, at include_kioslave_audiocd_TRUE@,$include_kioslave_audiocd_TRUE,;t t
+-s, at include_kioslave_audiocd_FALSE@,$include_kioslave_audiocd_FALSE,;t t
+-s, at include_kcm_audiocd_TRUE@,$include_kcm_audiocd_TRUE,;t t
+-s, at include_kcm_audiocd_FALSE@,$include_kcm_audiocd_FALSE,;t t
+-s, at LAME_LIBS@,$LAME_LIBS,;t t
+-s, at compile_mp3_export_TRUE@,$compile_mp3_export_TRUE,;t t
+-s, at compile_mp3_export_FALSE@,$compile_mp3_export_FALSE,;t t
+-s, at TAGLIB_CONFIG@,$TAGLIB_CONFIG,;t t
+-s, at taglib_includes@,$taglib_includes,;t t
+-s, at taglib_libs@,$taglib_libs,;t t
+-s, at AKODE_CONFIG@,$AKODE_CONFIG,;t t
+-s, at akode_includes@,$akode_includes,;t t
+-s, at akode_libs@,$akode_libs,;t t
+-s, at include_akode_mpeg_TRUE@,$include_akode_mpeg_TRUE,;t t
+-s, at include_akode_mpeg_FALSE@,$include_akode_mpeg_FALSE,;t t
+-s, at include_akode_mpc_TRUE@,$include_akode_mpc_TRUE,;t t
+-s, at include_akode_mpc_FALSE@,$include_akode_mpc_FALSE,;t t
+-s, at include_akode_xiph_TRUE@,$include_akode_xiph_TRUE,;t t
+-s, at include_akode_xiph_FALSE@,$include_akode_xiph_FALSE,;t t
+-s, at include_akode_ffmpeg_TRUE@,$include_akode_ffmpeg_TRUE,;t t
+-s, at include_akode_ffmpeg_FALSE@,$include_akode_ffmpeg_FALSE,;t t
+-s, at LIB_ARTS@,$LIB_ARTS,;t t
+-s, at ARTS_CFLAGS@,$ARTS_CFLAGS,;t t
+-s, at MPEGLIB_ARTS_MAJOR_VERSION@,$MPEGLIB_ARTS_MAJOR_VERSION,;t t
+-s, at MPEGLIB_ARTS_MINOR_VERSION@,$MPEGLIB_ARTS_MINOR_VERSION,;t t
+-s, at MPEGLIB_ARTS_MICRO_VERSION@,$MPEGLIB_ARTS_MICRO_VERSION,;t t
+-s, at MPEGLIB_ARTS_VERSION@,$MPEGLIB_ARTS_VERSION,;t t
+-s, at kde_artsplug_compiles@,$kde_artsplug_compiles,;t t
+-s, at ARTSC_INCLUDE@,$ARTSC_INCLUDE,;t t
+-s, at ARTSC_LIBS@,$ARTSC_LIBS,;t t
+-s, at arts_datadir@,$arts_datadir,;t t
+-s, at arts_includes@,$arts_includes,;t t
+-s, at arts_libraries@,$arts_libraries,;t t
+-s, at arts_within_KDE_TRUE@,$arts_within_KDE_TRUE,;t t
+-s, at arts_within_KDE_FALSE@,$arts_within_KDE_FALSE,;t t
+-s, at LIBAUDIOFILE@,$LIBAUDIOFILE,;t t
+-s, at link_lib_MB_TRUE@,$link_lib_MB_TRUE,;t t
+-s, at link_lib_MB_FALSE@,$link_lib_MB_FALSE,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at GST_CFLAGS@,$GST_CFLAGS,;t t
+-s, at GST_LIBS@,$GST_LIBS,;t t
+-s, at LDADD_GST@,$LDADD_GST,;t t
+-s, at LDFLAGS_GST@,$LDFLAGS_GST,;t t
+-s, at include_flac_SUBDIR_TRUE@,$include_flac_SUBDIR_TRUE,;t t
+-s, at include_flac_SUBDIR_FALSE@,$include_flac_SUBDIR_FALSE,;t t
+-s, at include_mp3_SUBDIR_TRUE@,$include_mp3_SUBDIR_TRUE,;t t
+-s, at include_mp3_SUBDIR_FALSE@,$include_mp3_SUBDIR_FALSE,;t t
+-s, at include_mpc_SUBDIR_TRUE@,$include_mpc_SUBDIR_TRUE,;t t
+-s, at include_mpc_SUBDIR_FALSE@,$include_mpc_SUBDIR_FALSE,;t t
+-s, at include_ogg_SUBDIR_TRUE@,$include_ogg_SUBDIR_TRUE,;t t
+-s, at include_ogg_SUBDIR_FALSE@,$include_ogg_SUBDIR_FALSE,;t t
+-s, at include_theora_SUBDIR_TRUE@,$include_theora_SUBDIR_TRUE,;t t
+-s, at include_theora_SUBDIR_FALSE@,$include_theora_SUBDIR_FALSE,;t t
+-s, at LIBFLAC@,$LIBFLAC,;t t
+-s, at LIBOGGFLAC@,$LIBOGGFLAC,;t t
+-s, at LIBCDAUDIO@,$LIBCDAUDIO,;t t
+-s, at LIBFPE@,$LIBFPE,;t t
+-s, at LIBCDROM@,$LIBCDROM,;t t
+-s, at LIBALIB@,$LIBALIB,;t t
+-s, at LIBAUDIO@,$LIBAUDIO,;t t
+-s, at LIBMME@,$LIBMME,;t t
+-s, at EXTRAINCS@,$EXTRAINCS,;t t
+-s, at EXTRALIBS@,$EXTRALIBS,;t t
+-s, at libwm_with_cdda_TRUE@,$libwm_with_cdda_TRUE,;t t
+-s, at libwm_with_cdda_FALSE@,$libwm_with_cdda_FALSE,;t t
+-s, at THIS_LIB_MAJOR_VERSION@,$THIS_LIB_MAJOR_VERSION,;t t
+-s, at THIS_LIB_MINOR_VERSION@,$THIS_LIB_MINOR_VERSION,;t t
+-s, at THIS_LIB_MICRO_VERSION@,$THIS_LIB_MICRO_VERSION,;t t
+-s, at THIS_LIB_VERSION@,$THIS_LIB_VERSION,;t t
+-s, at THIS_LIB_NAME@,$THIS_LIB_NAME,;t t
+-s, at OS_TYPE@,$OS_TYPE,;t t
+-s, at INTELCPPFLAG@,$INTELCPPFLAG,;t t
+-s, at THIS_LIB_LIBS@,$THIS_LIB_LIBS,;t t
+-s, at CCAS@,$CCAS,;t t
+-s, at CCASFLAGS@,$CCASFLAGS,;t t
+-s, at ARCH_CFLAGS@,$ARCH_CFLAGS,;t t
+-s, at MPG123_PLAT_LIB@,$MPG123_PLAT_LIB,;t t
+-s, at XINE_CONFIG@,$XINE_CONFIG,;t t
+-s, at XINE_CFLAGS@,$XINE_CFLAGS,;t t
+-s, at XINE_LIBS@,$XINE_LIBS,;t t
+-s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
+-s, at arts_SUBDIR_included_TRUE@,$arts_SUBDIR_included_TRUE,;t t
+-s, at arts_SUBDIR_included_FALSE@,$arts_SUBDIR_included_FALSE,;t t
+-s, at audiofile_artsplugin_SUBDIR_included_TRUE@,$audiofile_artsplugin_SUBDIR_included_TRUE,;t t
+-s, at audiofile_artsplugin_SUBDIR_included_FALSE@,$audiofile_artsplugin_SUBDIR_included_FALSE,;t t
+-s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
+-s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
+-s, at juk_SUBDIR_included_TRUE@,$juk_SUBDIR_included_TRUE,;t t
+-s, at juk_SUBDIR_included_FALSE@,$juk_SUBDIR_included_FALSE,;t t
+-s, at kaboodle_SUBDIR_included_TRUE@,$kaboodle_SUBDIR_included_TRUE,;t t
+-s, at kaboodle_SUBDIR_included_FALSE@,$kaboodle_SUBDIR_included_FALSE,;t t
+-s, at kappfinder_data_SUBDIR_included_TRUE@,$kappfinder_data_SUBDIR_included_TRUE,;t t
+-s, at kappfinder_data_SUBDIR_included_FALSE@,$kappfinder_data_SUBDIR_included_FALSE,;t t
+-s, at kfile_plugins_SUBDIR_included_TRUE@,$kfile_plugins_SUBDIR_included_TRUE,;t t
+-s, at kfile_plugins_SUBDIR_included_FALSE@,$kfile_plugins_SUBDIR_included_FALSE,;t t
+-s, at kmid_SUBDIR_included_TRUE@,$kmid_SUBDIR_included_TRUE,;t t
+-s, at kmid_SUBDIR_included_FALSE@,$kmid_SUBDIR_included_FALSE,;t t
+-s, at kmix_SUBDIR_included_TRUE@,$kmix_SUBDIR_included_TRUE,;t t
+-s, at kmix_SUBDIR_included_FALSE@,$kmix_SUBDIR_included_FALSE,;t t
+-s, at libkcddb_SUBDIR_included_TRUE@,$libkcddb_SUBDIR_included_TRUE,;t t
+-s, at libkcddb_SUBDIR_included_FALSE@,$libkcddb_SUBDIR_included_FALSE,;t t
+-s, at mpeglib_SUBDIR_included_TRUE@,$mpeglib_SUBDIR_included_TRUE,;t t
+-s, at mpeglib_SUBDIR_included_FALSE@,$mpeglib_SUBDIR_included_FALSE,;t t
+-s, at mpg123_artsplugin_SUBDIR_included_TRUE@,$mpg123_artsplugin_SUBDIR_included_TRUE,;t t
+-s, at mpg123_artsplugin_SUBDIR_included_FALSE@,$mpg123_artsplugin_SUBDIR_included_FALSE,;t t
+-s, at oggvorbis_artsplugin_SUBDIR_included_TRUE@,$oggvorbis_artsplugin_SUBDIR_included_TRUE,;t t
+-s, at oggvorbis_artsplugin_SUBDIR_included_FALSE@,$oggvorbis_artsplugin_SUBDIR_included_FALSE,;t t
+-s, at xine_artsplugin_SUBDIR_included_TRUE@,$xine_artsplugin_SUBDIR_included_TRUE,;t t
+-s, at xine_artsplugin_SUBDIR_included_FALSE@,$xine_artsplugin_SUBDIR_included_FALSE,;t t
+-s, at akode_artsplugin_SUBDIR_included_TRUE@,$akode_artsplugin_SUBDIR_included_TRUE,;t t
+-s, at akode_artsplugin_SUBDIR_included_FALSE@,$akode_artsplugin_SUBDIR_included_FALSE,;t t
+-s, at krec_SUBDIR_included_TRUE@,$krec_SUBDIR_included_TRUE,;t t
+-s, at krec_SUBDIR_included_FALSE@,$krec_SUBDIR_included_FALSE,;t t
+-s, at noatun_SUBDIR_included_TRUE@,$noatun_SUBDIR_included_TRUE,;t t
+-s, at noatun_SUBDIR_included_FALSE@,$noatun_SUBDIR_included_FALSE,;t t
+-s, at kscd_SUBDIR_included_TRUE@,$kscd_SUBDIR_included_TRUE,;t t
+-s, at kscd_SUBDIR_included_FALSE@,$kscd_SUBDIR_included_FALSE,;t t
+-s, at kioslave_SUBDIR_included_TRUE@,$kioslave_SUBDIR_included_TRUE,;t t
+-s, at kioslave_SUBDIR_included_FALSE@,$kioslave_SUBDIR_included_FALSE,;t t
+-s, at kaudiocreator_SUBDIR_included_TRUE@,$kaudiocreator_SUBDIR_included_TRUE,;t t
+-s, at kaudiocreator_SUBDIR_included_FALSE@,$kaudiocreator_SUBDIR_included_FALSE,;t t
+-s, at mpeglib_artsplug_SUBDIR_included_TRUE@,$mpeglib_artsplug_SUBDIR_included_TRUE,;t t
+-s, at mpeglib_artsplug_SUBDIR_included_FALSE@,$mpeglib_artsplug_SUBDIR_included_FALSE,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
++
++_ACEOF
++
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++SHELL!$SHELL$ac_delim
++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
++PACKAGE_NAME!$PACKAGE_NAME$ac_delim
++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
++PACKAGE_STRING!$PACKAGE_STRING$ac_delim
++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
++exec_prefix!$exec_prefix$ac_delim
++prefix!$prefix$ac_delim
++program_transform_name!$program_transform_name$ac_delim
++bindir!$bindir$ac_delim
++sbindir!$sbindir$ac_delim
++libexecdir!$libexecdir$ac_delim
++datarootdir!$datarootdir$ac_delim
++datadir!$datadir$ac_delim
++sysconfdir!$sysconfdir$ac_delim
++sharedstatedir!$sharedstatedir$ac_delim
++localstatedir!$localstatedir$ac_delim
++includedir!$includedir$ac_delim
++oldincludedir!$oldincludedir$ac_delim
++docdir!$docdir$ac_delim
++infodir!$infodir$ac_delim
++htmldir!$htmldir$ac_delim
++dvidir!$dvidir$ac_delim
++pdfdir!$pdfdir$ac_delim
++psdir!$psdir$ac_delim
++libdir!$libdir$ac_delim
++localedir!$localedir$ac_delim
++mandir!$mandir$ac_delim
++DEFS!$DEFS$ac_delim
++ECHO_C!$ECHO_C$ac_delim
++ECHO_N!$ECHO_N$ac_delim
++ECHO_T!$ECHO_T$ac_delim
++LIBS!$LIBS$ac_delim
++build_alias!$build_alias$ac_delim
++host_alias!$host_alias$ac_delim
++target_alias!$target_alias$ac_delim
++build!$build$ac_delim
++build_cpu!$build_cpu$ac_delim
++build_vendor!$build_vendor$ac_delim
++build_os!$build_os$ac_delim
++host!$host$ac_delim
++host_cpu!$host_cpu$ac_delim
++host_vendor!$host_vendor$ac_delim
++host_os!$host_os$ac_delim
++target!$target$ac_delim
++target_cpu!$target_cpu$ac_delim
++target_vendor!$target_vendor$ac_delim
++target_os!$target_os$ac_delim
++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
++INSTALL_DATA!$INSTALL_DATA$ac_delim
++CYGPATH_W!$CYGPATH_W$ac_delim
++PACKAGE!$PACKAGE$ac_delim
++VERSION!$VERSION$ac_delim
++ACLOCAL!$ACLOCAL$ac_delim
++AUTOCONF!$AUTOCONF$ac_delim
++AUTOMAKE!$AUTOMAKE$ac_delim
++AUTOHEADER!$AUTOHEADER$ac_delim
++MAKEINFO!$MAKEINFO$ac_delim
++install_sh!$install_sh$ac_delim
++STRIP!$STRIP$ac_delim
++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
++mkdir_p!$mkdir_p$ac_delim
++AWK!$AWK$ac_delim
++SET_MAKE!$SET_MAKE$ac_delim
++am__leading_dot!$am__leading_dot$ac_delim
++AMTAR!$AMTAR$ac_delim
++am__tar!$am__tar$ac_delim
++am__untar!$am__untar$ac_delim
++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
++MAINT!$MAINT$ac_delim
++KDECONFIG!$KDECONFIG$ac_delim
++kde_libs_prefix!$kde_libs_prefix$ac_delim
++kde_libs_htmldir!$kde_libs_htmldir$ac_delim
++CONF_FILES!$CONF_FILES$ac_delim
++CC!$CC$ac_delim
++CFLAGS!$CFLAGS$ac_delim
++LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
++ac_ct_CC!$ac_ct_CC$ac_delim
++EXEEXT!$EXEEXT$ac_delim
++OBJEXT!$OBJEXT$ac_delim
++DEPDIR!$DEPDIR$ac_delim
++am__include!$am__include$ac_delim
++am__quote!$am__quote$ac_delim
++AMDEP_TRUE!$AMDEP_TRUE$ac_delim
++AMDEP_FALSE!$AMDEP_FALSE$ac_delim
++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
++CCDEPMODE!$CCDEPMODE$ac_delim
++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++CPP!$CPP$ac_delim
++CXX!$CXX$ac_delim
++CXXFLAGS!$CXXFLAGS$ac_delim
++ac_ct_CXX!$ac_ct_CXX$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+-fi # test -n "$CONFIG_FILES"
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++CXXDEPMODE!$CXXDEPMODE$ac_delim
++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
++WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
++HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
++unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
++unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
++USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
++USE_RTTI!$USE_RTTI$ac_delim
++CXXCPP!$CXXCPP$ac_delim
++NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
++NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
++ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
++LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
++LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
++KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
++KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
++KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
++KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
++KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
++KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
++KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
++GREP!$GREP$ac_delim
++EGREP!$EGREP$ac_delim
++LN_S!$LN_S$ac_delim
++ECHO!$ECHO$ac_delim
++AR!$AR$ac_delim
++RANLIB!$RANLIB$ac_delim
++F77!$F77$ac_delim
++FFLAGS!$FFLAGS$ac_delim
++ac_ct_F77!$ac_ct_F77$ac_delim
++LIBTOOL!$LIBTOOL$ac_delim
++KDE_PLUGIN!$KDE_PLUGIN$ac_delim
++KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++LIBUTIL!$LIBUTIL$ac_delim
++LIBCOMPAT!$LIBCOMPAT$ac_delim
++LIBCRYPT!$LIBCRYPT$ac_delim
++LIBRESOLV!$LIBRESOLV$ac_delim
++LIB_POLL!$LIB_POLL$ac_delim
++FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
++LIBSOCKET!$LIBSOCKET$ac_delim
++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
++LIBUCB!$LIBUCB$ac_delim
++LIBDL!$LIBDL$ac_delim
++KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
++KDE_USE_PIE!$KDE_USE_PIE$ac_delim
++include_x11_TRUE!$include_x11_TRUE$ac_delim
++include_x11_FALSE!$include_x11_FALSE$ac_delim
++XMKMF!$XMKMF$ac_delim
++X_PRE_LIBS!$X_PRE_LIBS$ac_delim
++LIB_X11!$LIB_X11$ac_delim
++LIB_XRENDER!$LIB_XRENDER$ac_delim
++LIBSM!$LIBSM$ac_delim
++X_INCLUDES!$X_INCLUDES$ac_delim
++X_LDFLAGS!$X_LDFLAGS$ac_delim
++x_includes!$x_includes$ac_delim
++x_libraries!$x_libraries$ac_delim
++QTE_NORTTI!$QTE_NORTTI$ac_delim
++LIB_XEXT!$LIB_XEXT$ac_delim
++LIBPTHREAD!$LIBPTHREAD$ac_delim
++USE_THREADS!$USE_THREADS$ac_delim
++KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
++KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
++USER_INCLUDES!$USER_INCLUDES$ac_delim
++USER_LDFLAGS!$USER_LDFLAGS$ac_delim
++LIBZ!$LIBZ$ac_delim
++LIBPNG!$LIBPNG$ac_delim
++LIBJPEG!$LIBJPEG$ac_delim
++qt_libraries!$qt_libraries$ac_delim
++qt_includes!$qt_includes$ac_delim
++QT_INCLUDES!$QT_INCLUDES$ac_delim
++QT_LDFLAGS!$QT_LDFLAGS$ac_delim
++PERL!$PERL$ac_delim
++MOC!$MOC$ac_delim
++UIC!$UIC$ac_delim
++UIC_TR!$UIC_TR$ac_delim
++LIB_QT!$LIB_QT$ac_delim
++LIB_QPE!$LIB_QPE$ac_delim
++kde_qtver!$kde_qtver$ac_delim
++KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
++KDE_RPATH!$KDE_RPATH$ac_delim
++X_RPATH!$X_RPATH$ac_delim
++kde_libraries!$kde_libraries$ac_delim
++kde_includes!$kde_includes$ac_delim
++KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
++KDE_INCLUDES!$KDE_INCLUDES$ac_delim
++all_includes!$all_includes$ac_delim
++all_libraries!$all_libraries$ac_delim
++AUTODIRS!$AUTODIRS$ac_delim
++include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
++include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
++MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
++KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
++KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++DCOPIDLNG!$DCOPIDLNG$ac_delim
++DCOPIDL!$DCOPIDL$ac_delim
++DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
++DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
++MCOPIDL!$MCOPIDL$ac_delim
++ARTSCCONFIG!$ARTSCCONFIG$ac_delim
++MEINPROC!$MEINPROC$ac_delim
++KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
++XMLLINT!$XMLLINT$ac_delim
++kde_htmldir!$kde_htmldir$ac_delim
++kde_appsdir!$kde_appsdir$ac_delim
++kde_icondir!$kde_icondir$ac_delim
++kde_sounddir!$kde_sounddir$ac_delim
++kde_datadir!$kde_datadir$ac_delim
++kde_locale!$kde_locale$ac_delim
++kde_confdir!$kde_confdir$ac_delim
++kde_kcfgdir!$kde_kcfgdir$ac_delim
++kde_mimedir!$kde_mimedir$ac_delim
++kde_wallpaperdir!$kde_wallpaperdir$ac_delim
++kde_bindir!$kde_bindir$ac_delim
++xdg_appsdir!$xdg_appsdir$ac_delim
++xdg_menudir!$xdg_menudir$ac_delim
++xdg_directorydir!$xdg_directorydir$ac_delim
++kde_templatesdir!$kde_templatesdir$ac_delim
++kde_servicesdir!$kde_servicesdir$ac_delim
++kde_servicetypesdir!$kde_servicetypesdir$ac_delim
++kde_moduledir!$kde_moduledir$ac_delim
++kdeinitdir!$kdeinitdir$ac_delim
++kde_styledir!$kde_styledir$ac_delim
++kde_widgetdir!$kde_widgetdir$ac_delim
++LIB_KDED!$LIB_KDED$ac_delim
++LIB_KDECORE!$LIB_KDECORE$ac_delim
++LIB_KDEUI!$LIB_KDEUI$ac_delim
++LIB_KIO!$LIB_KIO$ac_delim
++LIB_KJS!$LIB_KJS$ac_delim
++LIB_SMB!$LIB_SMB$ac_delim
++LIB_KAB!$LIB_KAB$ac_delim
++LIB_KABC!$LIB_KABC$ac_delim
++LIB_KHTML!$LIB_KHTML$ac_delim
++LIB_KSPELL!$LIB_KSPELL$ac_delim
++LIB_KPARTS!$LIB_KPARTS$ac_delim
++LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
++LIB_KUTILS!$LIB_KUTILS$ac_delim
++LIB_KDEPIM!$LIB_KDEPIM$ac_delim
++LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
++LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
++LIB_KDNSSD!$LIB_KDNSSD$ac_delim
++LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
++LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
++LIB_KFILE!$LIB_KFILE$ac_delim
++LIB_KFM!$LIB_KFM$ac_delim
++ARCH_TYPE!$ARCH_TYPE$ac_delim
++VORBIS_LIBS!$VORBIS_LIBS$ac_delim
++VORBISFILE_LIBS!$VORBISFILE_LIBS$ac_delim
++VORBISENC_LIBS!$VORBISENC_LIBS$ac_delim
++compile_ogg_export_TRUE!$compile_ogg_export_TRUE$ac_delim
++compile_ogg_export_FALSE!$compile_ogg_export_FALSE$ac_delim
++LIBOSSAUDIO!$LIBOSSAUDIO$ac_delim
++LIBASOUND!$LIBASOUND$ac_delim
++ARTS_LIBASOUND!$ARTS_LIBASOUND$ac_delim
++CDPARANOIA_LIBS!$CDPARANOIA_LIBS$ac_delim
++include_kioslave_audiocd_TRUE!$include_kioslave_audiocd_TRUE$ac_delim
++include_kioslave_audiocd_FALSE!$include_kioslave_audiocd_FALSE$ac_delim
++include_kcm_audiocd_TRUE!$include_kcm_audiocd_TRUE$ac_delim
++include_kcm_audiocd_FALSE!$include_kcm_audiocd_FALSE$ac_delim
++LAME_LIBS!$LAME_LIBS$ac_delim
++compile_mp3_export_TRUE!$compile_mp3_export_TRUE$ac_delim
++compile_mp3_export_FALSE!$compile_mp3_export_FALSE$ac_delim
++TAGLIB_CONFIG!$TAGLIB_CONFIG$ac_delim
++taglib_includes!$taglib_includes$ac_delim
++taglib_libs!$taglib_libs$ac_delim
++AKODE_CONFIG!$AKODE_CONFIG$ac_delim
++akode_includes!$akode_includes$ac_delim
++akode_libs!$akode_libs$ac_delim
++include_akode_mpeg_TRUE!$include_akode_mpeg_TRUE$ac_delim
++include_akode_mpeg_FALSE!$include_akode_mpeg_FALSE$ac_delim
++include_akode_mpc_TRUE!$include_akode_mpc_TRUE$ac_delim
++include_akode_mpc_FALSE!$include_akode_mpc_FALSE$ac_delim
++include_akode_xiph_TRUE!$include_akode_xiph_TRUE$ac_delim
++include_akode_xiph_FALSE!$include_akode_xiph_FALSE$ac_delim
++include_akode_ffmpeg_TRUE!$include_akode_ffmpeg_TRUE$ac_delim
++include_akode_ffmpeg_FALSE!$include_akode_ffmpeg_FALSE$ac_delim
++LIB_ARTS!$LIB_ARTS$ac_delim
++ARTS_CFLAGS!$ARTS_CFLAGS$ac_delim
++MPEGLIB_ARTS_MAJOR_VERSION!$MPEGLIB_ARTS_MAJOR_VERSION$ac_delim
++MPEGLIB_ARTS_MINOR_VERSION!$MPEGLIB_ARTS_MINOR_VERSION$ac_delim
++MPEGLIB_ARTS_MICRO_VERSION!$MPEGLIB_ARTS_MICRO_VERSION$ac_delim
++MPEGLIB_ARTS_VERSION!$MPEGLIB_ARTS_VERSION$ac_delim
++kde_artsplug_compiles!$kde_artsplug_compiles$ac_delim
++ARTSC_INCLUDE!$ARTSC_INCLUDE$ac_delim
++ARTSC_LIBS!$ARTSC_LIBS$ac_delim
++arts_datadir!$arts_datadir$ac_delim
++arts_includes!$arts_includes$ac_delim
++arts_libraries!$arts_libraries$ac_delim
++arts_within_KDE_TRUE!$arts_within_KDE_TRUE$ac_delim
++arts_within_KDE_FALSE!$arts_within_KDE_FALSE$ac_delim
++LIBAUDIOFILE!$LIBAUDIOFILE$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++CEOF$ac_eof
++_ACEOF
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++link_lib_MB_TRUE!$link_lib_MB_TRUE$ac_delim
++link_lib_MB_FALSE!$link_lib_MB_FALSE$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++GST_CFLAGS!$GST_CFLAGS$ac_delim
++GST_LIBS!$GST_LIBS$ac_delim
++LDADD_GST!$LDADD_GST$ac_delim
++LDFLAGS_GST!$LDFLAGS_GST$ac_delim
++include_flac_SUBDIR_TRUE!$include_flac_SUBDIR_TRUE$ac_delim
++include_flac_SUBDIR_FALSE!$include_flac_SUBDIR_FALSE$ac_delim
++include_mp3_SUBDIR_TRUE!$include_mp3_SUBDIR_TRUE$ac_delim
++include_mp3_SUBDIR_FALSE!$include_mp3_SUBDIR_FALSE$ac_delim
++include_mpc_SUBDIR_TRUE!$include_mpc_SUBDIR_TRUE$ac_delim
++include_mpc_SUBDIR_FALSE!$include_mpc_SUBDIR_FALSE$ac_delim
++include_ogg_SUBDIR_TRUE!$include_ogg_SUBDIR_TRUE$ac_delim
++include_ogg_SUBDIR_FALSE!$include_ogg_SUBDIR_FALSE$ac_delim
++include_theora_SUBDIR_TRUE!$include_theora_SUBDIR_TRUE$ac_delim
++include_theora_SUBDIR_FALSE!$include_theora_SUBDIR_FALSE$ac_delim
++LIBFLAC!$LIBFLAC$ac_delim
++LIBOGGFLAC!$LIBOGGFLAC$ac_delim
++LIBCDAUDIO!$LIBCDAUDIO$ac_delim
++LIBFPE!$LIBFPE$ac_delim
++LIBCDROM!$LIBCDROM$ac_delim
++LIBALIB!$LIBALIB$ac_delim
++LIBAUDIO!$LIBAUDIO$ac_delim
++LIBMME!$LIBMME$ac_delim
++EXTRAINCS!$EXTRAINCS$ac_delim
++EXTRALIBS!$EXTRALIBS$ac_delim
++libwm_with_cdda_TRUE!$libwm_with_cdda_TRUE$ac_delim
++libwm_with_cdda_FALSE!$libwm_with_cdda_FALSE$ac_delim
++THIS_LIB_MAJOR_VERSION!$THIS_LIB_MAJOR_VERSION$ac_delim
++THIS_LIB_MINOR_VERSION!$THIS_LIB_MINOR_VERSION$ac_delim
++THIS_LIB_MICRO_VERSION!$THIS_LIB_MICRO_VERSION$ac_delim
++THIS_LIB_VERSION!$THIS_LIB_VERSION$ac_delim
++THIS_LIB_NAME!$THIS_LIB_NAME$ac_delim
++OS_TYPE!$OS_TYPE$ac_delim
++INTELCPPFLAG!$INTELCPPFLAG$ac_delim
++THIS_LIB_LIBS!$THIS_LIB_LIBS$ac_delim
++CCAS!$CCAS$ac_delim
++CCASFLAGS!$CCASFLAGS$ac_delim
++ARCH_CFLAGS!$ARCH_CFLAGS$ac_delim
++MPG123_PLAT_LIB!$MPG123_PLAT_LIB$ac_delim
++XINE_CONFIG!$XINE_CONFIG$ac_delim
++XINE_CFLAGS!$XINE_CFLAGS$ac_delim
++XINE_LIBS!$XINE_LIBS$ac_delim
++TOPSUBDIRS!$TOPSUBDIRS$ac_delim
++arts_SUBDIR_included_TRUE!$arts_SUBDIR_included_TRUE$ac_delim
++arts_SUBDIR_included_FALSE!$arts_SUBDIR_included_FALSE$ac_delim
++audiofile_artsplugin_SUBDIR_included_TRUE!$audiofile_artsplugin_SUBDIR_included_TRUE$ac_delim
++audiofile_artsplugin_SUBDIR_included_FALSE!$audiofile_artsplugin_SUBDIR_included_FALSE$ac_delim
++doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
++doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
++juk_SUBDIR_included_TRUE!$juk_SUBDIR_included_TRUE$ac_delim
++juk_SUBDIR_included_FALSE!$juk_SUBDIR_included_FALSE$ac_delim
++kaboodle_SUBDIR_included_TRUE!$kaboodle_SUBDIR_included_TRUE$ac_delim
++kaboodle_SUBDIR_included_FALSE!$kaboodle_SUBDIR_included_FALSE$ac_delim
++kappfinder_data_SUBDIR_included_TRUE!$kappfinder_data_SUBDIR_included_TRUE$ac_delim
++kappfinder_data_SUBDIR_included_FALSE!$kappfinder_data_SUBDIR_included_FALSE$ac_delim
++kfile_plugins_SUBDIR_included_TRUE!$kfile_plugins_SUBDIR_included_TRUE$ac_delim
++kfile_plugins_SUBDIR_included_FALSE!$kfile_plugins_SUBDIR_included_FALSE$ac_delim
++kmid_SUBDIR_included_TRUE!$kmid_SUBDIR_included_TRUE$ac_delim
++kmid_SUBDIR_included_FALSE!$kmid_SUBDIR_included_FALSE$ac_delim
++kmix_SUBDIR_included_TRUE!$kmix_SUBDIR_included_TRUE$ac_delim
++kmix_SUBDIR_included_FALSE!$kmix_SUBDIR_included_FALSE$ac_delim
++libkcddb_SUBDIR_included_TRUE!$libkcddb_SUBDIR_included_TRUE$ac_delim
++libkcddb_SUBDIR_included_FALSE!$libkcddb_SUBDIR_included_FALSE$ac_delim
++mpeglib_SUBDIR_included_TRUE!$mpeglib_SUBDIR_included_TRUE$ac_delim
++mpeglib_SUBDIR_included_FALSE!$mpeglib_SUBDIR_included_FALSE$ac_delim
++mpg123_artsplugin_SUBDIR_included_TRUE!$mpg123_artsplugin_SUBDIR_included_TRUE$ac_delim
++mpg123_artsplugin_SUBDIR_included_FALSE!$mpg123_artsplugin_SUBDIR_included_FALSE$ac_delim
++oggvorbis_artsplugin_SUBDIR_included_TRUE!$oggvorbis_artsplugin_SUBDIR_included_TRUE$ac_delim
++oggvorbis_artsplugin_SUBDIR_included_FALSE!$oggvorbis_artsplugin_SUBDIR_included_FALSE$ac_delim
++xine_artsplugin_SUBDIR_included_TRUE!$xine_artsplugin_SUBDIR_included_TRUE$ac_delim
++xine_artsplugin_SUBDIR_included_FALSE!$xine_artsplugin_SUBDIR_included_FALSE$ac_delim
++akode_artsplugin_SUBDIR_included_TRUE!$akode_artsplugin_SUBDIR_included_TRUE$ac_delim
++akode_artsplugin_SUBDIR_included_FALSE!$akode_artsplugin_SUBDIR_included_FALSE$ac_delim
++krec_SUBDIR_included_TRUE!$krec_SUBDIR_included_TRUE$ac_delim
++krec_SUBDIR_included_FALSE!$krec_SUBDIR_included_FALSE$ac_delim
++noatun_SUBDIR_included_TRUE!$noatun_SUBDIR_included_TRUE$ac_delim
++noatun_SUBDIR_included_FALSE!$noatun_SUBDIR_included_FALSE$ac_delim
++kscd_SUBDIR_included_TRUE!$kscd_SUBDIR_included_TRUE$ac_delim
++kscd_SUBDIR_included_FALSE!$kscd_SUBDIR_included_FALSE$ac_delim
++kioslave_SUBDIR_included_TRUE!$kioslave_SUBDIR_included_TRUE$ac_delim
++kioslave_SUBDIR_included_FALSE!$kioslave_SUBDIR_included_FALSE$ac_delim
++kaudiocreator_SUBDIR_included_TRUE!$kaudiocreator_SUBDIR_included_TRUE$ac_delim
++kaudiocreator_SUBDIR_included_FALSE!$kaudiocreator_SUBDIR_included_FALSE$ac_delim
++mpeglib_artsplug_SUBDIR_included_TRUE!$mpeglib_artsplug_SUBDIR_included_TRUE$ac_delim
++mpeglib_artsplug_SUBDIR_included_FALSE!$mpeglib_artsplug_SUBDIR_included_FALSE$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 89; then
++    break
++  elif $ac_last_try; then
++    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
+ 
++ac_eof=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++_ACEOF
++sed '
++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
++s/^/s,@/; s/!/@,|#_!!_#|/
++:n
++t n
++s/'"$ac_delim"'$/,g/; t
++s/$/\\/; p
++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
++' >>$CONFIG_STATUS <conf$$subs.sed
++rm -f conf$$subs.sed
++cat >>$CONFIG_STATUS <<_ACEOF
++:end
++s/|#_!!_#|//g
++CEOF$ac_eof
+ _ACEOF
++
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[	 ]*\):*/\1/
++s/:*$//
++s/^[^=]*=[	 ]*$//
++}'
++fi
++
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++fi # test -n "$CONFIG_FILES"
++
++
++for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
++do
++  case $ac_tag in
++  :[FHLC]) ac_mode=$ac_tag; continue;;
++  esac
++  case $ac_mode$ac_tag in
++  :[FHL]*:*);;
++  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
++echo "$as_me: error: Invalid tag $ac_tag." >&2;}
++   { (exit 1); exit 1; }; };;
++  :[FH]-) ac_tag=-:-;;
++  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++  esac
++  ac_save_IFS=$IFS
++  IFS=:
++  set x $ac_tag
++  IFS=$ac_save_IFS
++  shift
++  ac_file=$1
++  shift
++
++  case $ac_mode in
++  :L) ac_source=$1;;
++  :[FH])
++    ac_file_inputs=
++    for ac_f
++    do
++      case $ac_f in
++      -) ac_f="$tmp/stdin";;
++      *) # Look for the file first in the build tree, then in the source tree
++	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
++	 # because $ac_f cannot contain `:'.
++	 test -f "$ac_f" ||
++	   case $ac_f in
++	   [\\/$]*) false;;
++	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++	   esac ||
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++   { (exit 1); exit 1; }; };;
++      esac
++      ac_file_inputs="$ac_file_inputs $ac_f"
++    done
++
++    # Let's still pretend it is `configure' which instantiates (i.e., don't
++    # use $as_me), people would be surprised to read:
++    #    /* config.h.  Generated by config.status.  */
++    configure_input="Generated from "`IFS=:
++	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
++    if test x"$ac_file" != x-; then
++      configure_input="$ac_file.  $configure_input"
++      { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    fi
++
++    case $ac_tag in
++    *:-:* | *:-) cat >"$tmp/stdin";;
++    esac
++    ;;
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++  ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++  { as_dir="$ac_dir"
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+   ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+ 
++  case $ac_mode in
++  :F)
++  #
++  # CONFIG_FILE
++  #
+ 
+   case $INSTALL in
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++_ACEOF
+ 
 -  if test x"$ac_file" != x-; then
 -    { echo "$as_me:$LINENO: creating $ac_file" >&5
 -echo "$as_me: creating $ac_file" >&6;}
 -    rm -f "$ac_file"
 -  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -44919,6 +44362,12 @@
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-				     sed 's,.*/,,'` by configure."
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=
 +
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
++case `sed -n '/datarootdir/ {
++  p
++  q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p
++' $ac_file_inputs` in
++*datarootdir*) ;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  ac_datarootdir_hack='
++  s&@datadir@&$datadir&g
++  s&@docdir@&$docdir&g
++  s&@infodir@&$infodir&g
++  s&@localedir@&$localedir&g
++  s&@mandir@&$mandir&g
++    s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
  _ACEOF
++
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
+ $extrasub
+@@ -44940,248 +45636,122 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s, at configure_input@,$configure_input,;t t
+-s, at srcdir@,$ac_srcdir,;t t
+-s, at abs_srcdir@,$ac_abs_srcdir,;t t
+-s, at top_srcdir@,$ac_top_srcdir,;t t
+-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s, at builddir@,$ac_builddir,;t t
+-s, at abs_builddir@,$ac_abs_builddir,;t t
+-s, at top_builddir@,$ac_top_builddir,;t t
+-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s, at INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+-ac_dB='[	 ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
++s&@configure_input@&$configure_input&;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++$ac_datarootdir_hack
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
+ 
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  rm -f "$tmp/stdin"
+   case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++  -) cat "$tmp/out"; rm -f "$tmp/out";;
++  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+   esac
+-
+-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 # Do quote $f, to prevent DOS paths from being IFS'd.
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-  # Remove the trailing spaces.
+-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+-
++ ;;
++  :H)
++  #
++  # CONFIG_HEADER
++  #
+ _ACEOF
+ 
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h.  The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status.  Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless.  Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
++# Transform confdefs.h into a sed script `conftest.defines', that
++# substitutes the proper values into config.h.in to produce config.h.
++rm -f conftest.defines conftest.tail
++# First, append a space to every undef/define line, to ease matching.
++echo 's/$/ /' >conftest.defines
++# Then, protect against being on the right side of a sed subst, or in
++# an unquoted here document, in config.status.  If some macros were
++# called several times there might be several #defines for the same
++# symbol, which is useless.  But do not sort them, since the last
++# AC_DEFINE must be honored.
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
++# NAME is the cpp macro being defined, VALUE is the value it is being given.
++# PARAMS is the parameter list in the macro definition--in most cases, it's
++# just an empty string.
++ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
++ac_dB='\\)[	 (].*,\\1define\\2'
++ac_dC=' '
++ac_dD=' ,'
+ 
+-# This sed command replaces #undef with comments.  This is necessary, for
++uniq confdefs.h |
++  sed -n '
++	t rset
++	:rset
++	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
++	t ok
++	d
++	:ok
++	s/[\\&,]/\\&/g
++	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
++	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
++  ' >>conftest.defines
++
++# Remove the space that was appended to ease matching.
++# Then replace #undef with comments.  This is necessary, for
+ # example, in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++# (The regexp can be short, since the line contains either #define or #undef.)
++echo 's/ $//
++s,^[	 #]*u.*,/* & */,' >>conftest.defines
++
++# Break up conftest.defines:
++ac_max_sed_lines=50
++
++# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
++# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
++# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
++# et cetera.
++ac_in='$ac_file_inputs'
++ac_out='"$tmp/out1"'
++ac_nxt='"$tmp/out2"'
++
++while :
++do
++  # Write a here document:
++    cat >>$CONFIG_STATUS <<_ACEOF
++    # First, check the format of the line:
++    cat >"\$tmp/defines.sed" <<\\CEOF
++/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
++/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
++b
++:def
+ _ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/defines.sed.
+-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#define' lines.
+-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+   echo 'CEOF
+-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++  grep . conftest.tail >/dev/null || break
+   rm -f conftest.defines
+   mv conftest.tail conftest.defines
+ done
+-rm -f conftest.defines
+-echo '  fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/undefs.sed.
+-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#undef'
+-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+-  rm -f conftest.undefs
+-  mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
++rm -f conftest.defines conftest.tail
+ 
++echo "ac_result=$ac_in" >>$CONFIG_STATUS
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    echo "/* Generated by configure.  */" >$tmp/config.h
+-  else
+-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+-  fi
+-  cat $tmp/in >>$tmp/config.h
+-  rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++    echo "/* $configure_input  */" >"$tmp/config.h"
++    cat "$ac_result" >>"$tmp/config.h"
++    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_file" : 'X\(//\)[^/]' \| \
+-	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-      { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+       rm -f $ac_file
+-      mv $tmp/config.h $ac_file
++      mv "$tmp/config.h" $ac_file
+     fi
+   else
+-    cat $tmp/config.h
+-    rm -f $tmp/config.h
++    echo "/* $configure_input  */"
++    cat "$ac_result"
+   fi
++  rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+@@ -45192,135 +45762,39 @@
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+ $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X$ac_file : 'X\(//\)[^/]' \| \
+ 	 X$ac_file : 'X\(//\)$' \| \
+-	 X$ac_file : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+ echo X$ac_file |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+-	 X"$ac_dest" : 'X\(//\)$' \| \
+-	 X"$ac_dest" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+-  ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
++  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
++echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++  esac
+ 
+ 
+-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+-  case $ac_dest in
+-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++  case $ac_file$ac_mode in
++    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+   # Strip MF so we end up with the name of the file.
+   mf=`echo "$mf" | sed -e 's/:.*$//'`
+   # Check whether this is an Automake generated Makefile or not.
+@@ -45330,18 +45804,29 @@
+   # each Makefile.in and add a new line on top of each file to say so.
+   # So let's grep whole file.
+   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+-    dirpart=`(dirname "$mf") 2>/dev/null ||
++    dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+ 	 X"$mf" : 'X\(//\)$' \| \
+-	 X"$mf" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$mf" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   else
+     continue
+   fi
+@@ -45363,49 +45848,76 @@
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+-    fdir=`(dirname "$file") 2>/dev/null ||
++    fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$file" : 'X\(//\)[^/]' \| \
+ 	 X"$file" : 'X\(//\)$' \| \
+-	 X"$file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    { if $as_mkdir_p; then
+-    mkdir -p $dirpart/$fdir
+-  else
+-    as_dir=$dirpart/$fdir
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++    { as_dir=$dirpart/$fdir
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+     # echo "creating $dirpart/$file"
+     echo '# dummy' > "$dirpart/$file"
+   done
+ done
+  ;;
+-    default-1 )
++    "default-1":C)
+ if echo $TOPSUBDIRS | grep "kscd" > /dev/null 2> /dev/null; then
+   if test "$use_kscd_defaults" = "yes"; then
+     test -d kscd || mkdir kscd
+@@ -45416,11 +45928,10 @@
+   fi
+ fi
+  ;;
++
+   esac
+-done
+-_ACEOF
++done # for ac_tag
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
 --- configure.in
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdemultimedia, "3.5.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdemultimedia, "3.5.3") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -1277,12 +1279,6 @@
+@@ -1287,12 +1289,6 @@
  AC_MSG_RESULT($OS_TYPE)
  
  INTELCPPFLAG=
@@ -17938,7 +39499,15 @@
  AC_DEFUN([KDE_MPEGLIB_COMPILES],
 --- doc/artsbuilder/images/Makefile.in
 +++ doc/artsbuilder/images/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17948,7 +39517,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17957,7 +39584,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17969,43 +39596,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,28 +617,28 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Interface_MIDI_NOTE.png Gui_PANEL.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_MUL.png Synth_ENVELOPE_ADSR.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_SEQUENCE_FREQ.png Synth_PSCALE.png Gui_SLIDER.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_PLAY_WAV.png Synth_SEQUENCE.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_DEBUG.png Synth_DELAY.png Gui_WINDOW.png Synth_WAVE_TRI.png Gui_AUDIO_MANAGER.png Gui_LABEL.png schema3.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_CDELAY.png Synth_NIL.png Gui_INSTRUMENT_MAPPER.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_XFADE.png Synth_COMPRESSOR.png Makefile.in Synth_BUS_UPLINK.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_DIV.png Gui_MIXER.png Synth_ATAN_SATURATE.png Doc_MODUL.png Makefile.am schema2.png 
-+KDE_DIST=Gui_AUDIO_MANAGER.png Gui_LABEL.png Interface_MIDI_NOTE.png schema3.png Synth_PLAY_AKAIS.png Gui_PANEL.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_CDELAY.png Synth_MUL.png Synth_NIL.png Synth_ENVELOPE_ADSR.png Gui_INSTRUMENT_MAPPER.png Synth_PLAY.png Synth_FILEPLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_PSCALE.png Synth_COMPRESSOR.png Synth_BUS_UPLINK.png Makefile.in Gui_SLIDER.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_DIV.png Gui_MIXER.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_ATAN_SATURATE.png Synth_DEBUG.png Synth_DELAY.png Doc_MODUL.png Makefile.am Gui_WINDOW.png Synth_WAVE_TRI.png schema2.png 
- 
- #>+ 2
--docs-am: Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png 
-+docs-am: Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png 
- 
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images
--	@for base in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
-+	@for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
-+	for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in Gui_INSTRUMENT_MAPPER.png Gui_AUDIO_MANAGER.png Synth_STD_EQUALIZER.png Synth_PLAY_AKAIS.png Synth_WAVE_TRI.png Synth_MIDI_ROUTER.png Synth_WAVE_SQUARE.png Synth_SEQUENCE_FREQ.png Synth_DEBUG.png Gui_WINDOW.png Synth_XFADE.png Synth_COMPRESSOR.png Synth_SHELVE_CUTOFF.png Synth_DELAY.png Gui_LABEL.png Synth_STRUCT_KILL.png Synth_CDELAY.png Gui_SLIDER.png Synth_RC.png Synth_PLAY.png Synth_PSCALE.png Synth_SEQUENCE.png Synth_BUS_UPLINK.png Synth_WAVE_SIN.png Gui_PANEL.png Doc_MODUL.png Synth_NIL.png Synth_FM_SOURCE.png Synth_DIV.png Synth_PLAY_WAV.png Synth_ENVELOPE_ADSR.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png Synth_ADD.png Synth_PLAY_AKAI.png Gui_POTI.png Synth_ATAN_SATURATE.png schema1.png Synth_MUL.png schema2.png Synth_BUS_DOWNLINK.png schema3.png schema4.png Synth_FREQUENCY.png Interface_MIDI_NOTE.png Gui_MIXER.png Synth_FILEPLAY.png ; do \
-+	for file in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/artsbuilder/Makefile.in
 +++ doc/artsbuilder/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18015,7 +39616,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -448,7 +457,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18024,7 +39683,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18036,46 +39695,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -781,10 +784,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=future.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook artsbuilder.docbook detail.docbook midiintro.docbook mcop.docbook modules.docbook gui.docbook faq.docbook index.cache.bz2 midi.docbook tools.docbook Makefile.in digitalaudio.docbook references.docbook apis.docbook Makefile.am 
-+KDE_DIST=future.docbook midi.docbook tools.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook detail.docbook artsbuilder.docbook midiintro.docbook Makefile.in digitalaudio.docbook mcop.docbook modules.docbook gui.docbook references.docbook apis.docbook faq.docbook Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook 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
-@@ -811,20 +814,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder
--	@for base in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
-+	@for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
-+	for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in arts-structure.png tools.docbook detail.docbook glossary.docbook index.docbook faq.docbook modules.docbook future.docbook artsbuilder.docbook references.docbook midi.docbook porting.docbook gui.docbook helping.docbook apis.docbook midiintro.docbook mcop.docbook digitalaudio.docbook ; do \
-+	for file in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/juk/Makefile.in
 +++ doc/juk/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18085,7 +39715,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18094,7 +39782,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18106,46 +39794,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,10 +617,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=juk-adv-search.png search-playlist.png index.docbook juk-main.png juk-file-renamer.png juk-tag-guesser.png index.cache.bz2 history-playlist.png normal-playlist.png Makefile.in toolbar.png Makefile.am 
-+KDE_DIST=juk-adv-search.png history-playlist.png index.docbook search-playlist.png normal-playlist.png juk-file-renamer.png juk-main.png Makefile.in toolbar.png Makefile.am juk-tag-guesser.png index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -644,20 +647,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
--	@for base in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
-+	@for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
-+	for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in juk-file-renamer.png juk-tag-guesser.png history-playlist.png toolbar.png index.docbook juk-adv-search.png search-playlist.png normal-playlist.png juk-main.png ; do \
-+	for file in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kaboodle/Makefile.in
 +++ doc/kaboodle/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18155,7 +39814,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18164,7 +39881,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18176,18 +39893,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,7 +617,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/kaudiocreator/Makefile.in
 +++ doc/kaudiocreator/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18197,7 +39913,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18206,7 +39980,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18218,46 +39992,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,10 +617,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cddbconfigurationlookup.png cdinserted.png cddbconfigurationsubmit.png kaudiocreatormainwindow800.png index.docbook encodernotfound.png encoderconfiguration.png index.cache.bz2 readytorip.png rippingandencoding.png jobcontrol.png confirmartistcarryover.png cdconfiguration.png generalconfiguration.png setalbumcategory.png ripperconfiguration.png Makefile.in rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png Makefile.am lameconfiguration.png 
-+KDE_DIST=cddbconfigurationlookup.png cdinserted.png readytorip.png rippingandencoding.png cddbconfigurationsubmit.png jobcontrol.png index.docbook kaudiocreatormainwindow800.png confirmartistcarryover.png cdconfiguration.png setalbumcategory.png generalconfiguration.png ripperconfiguration.png Makefile.in rippingandencoding2.png entersong1.png startalbumeditor.png encodernotfound.png jobshavestarted.png Makefile.am encoderconfiguration.png index.cache.bz2 lameconfiguration.png 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -644,20 +647,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator
--	@for base in rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png ; do \
-+	@for base in rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png ; do \
-+	for base in rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kaudiocreator/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in rippingandencoding.png encodernotfound.png setalbumcategory.png index.docbook cddbconfigurationsubmit.png generalconfiguration.png lameconfiguration.png encoderconfiguration.png cdconfiguration.png jobcontrol.png kaudiocreatormainwindow800.png cddbconfigurationlookup.png confirmartistcarryover.png readytorip.png cdinserted.png rippingandencoding2.png entersong1.png startalbumeditor.png jobshavestarted.png ripperconfiguration.png ; do \
-+	for file in rippingandencoding2.png cddbconfigurationlookup.png cdconfiguration.png startalbumeditor.png lameconfiguration.png rippingandencoding.png readytorip.png confirmartistcarryover.png encodernotfound.png generalconfiguration.png jobshavestarted.png cdinserted.png encoderconfiguration.png entersong1.png setalbumcategory.png jobcontrol.png kaudiocreatormainwindow800.png ripperconfiguration.png index.docbook cddbconfigurationsubmit.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kioslave/Makefile.in
 +++ doc/kioslave/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18267,7 +40012,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18276,7 +40079,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18290,7 +40093,15 @@
  mostlyclean-libtool:
 --- doc/kmid/Makefile.in
 +++ doc/kmid/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18300,7 +40111,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18309,7 +40178,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18321,18 +40190,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,7 +617,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/kmix/Makefile.in
 +++ doc/kmix/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18342,7 +40210,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18351,7 +40277,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18363,46 +40289,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,10 +617,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=index.docbook kmix-window.png index.cache.bz2 kmix-channel-record.png Makefile.in kmix-channel-playback.png Makefile.am 
-+KDE_DIST=index.docbook Makefile.in kmix-window.png kmix-channel-playback.png Makefile.am index.cache.bz2 kmix-channel-record.png 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmix-window.png kmix-channel-record.png kmix-channel-playback.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
-@@ -644,20 +647,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix
--	@for base in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
-+	@for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
-+	for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in kmix-window.png index.docbook kmix-channel-playback.png kmix-channel-record.png ; do \
-+	for file in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/krec/Makefile.in
 +++ doc/krec/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18412,7 +40309,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18421,7 +40376,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18433,46 +40388,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,10 +617,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png index.cache.bz2 Makefile.in krec-new_file_properties.png Makefile.am 
-+KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png Makefile.in krec-new_file_properties.png Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.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
-@@ -644,20 +647,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec
--	@for base in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
-+	@for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
-+	for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in krec-hicolor.png index.docbook krec-keramik.png krec-new_file_properties.png krec-configuration.png ; do \
-+	for file in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kscd/Makefile.in
 +++ doc/kscd/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18482,7 +40408,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18491,7 +40475,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18503,46 +40487,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,10 +617,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 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 kscdannounc.png index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.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
-@@ -644,20 +647,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
--	@for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.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 kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.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 kscdannounc.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/Makefile.in
 +++ doc/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18552,14 +40507,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,13 +445,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. artsbuilder kaboodle kmid krec kscd noatun kmix juk kioslave kaudiocreator
-+SUBDIRS =. juk kmid kmix krec kscd kaboodle kioslave artsbuilder kaudiocreator noatun
- #>- all: all-recursive
- #>+ 1
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -448,7 +457,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -18568,7 +40574,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18582,7 +40588,15 @@
  mostlyclean-libtool:
 --- doc/noatun/Makefile.in
 +++ doc/noatun/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18592,7 +40606,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18601,7 +40673,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18613,18 +40685,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -614,7 +617,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 
 --- juk/Makefile.in
 +++ juk/Makefile.in
-@@ -321,6 +321,9 @@
+@@ -230,6 +230,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -321,6 +322,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18634,7 +40705,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -720,7 +723,7 @@
+@@ -376,18 +380,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -423,14 +425,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -512,6 +518,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -526,8 +533,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -720,7 +729,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18643,7 +40772,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -758,9 +761,9 @@
+@@ -758,9 +767,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18655,124 +40784,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1267,18 +1270,18 @@
- mocs: collectionlist.moc
- 
- #>+ 3
--googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
--	$(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
-+deletedialog.moc: $(srcdir)/deletedialog.h
-+	$(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
- 
- #>+ 2
--mocs: googlefetcherdialog.moc
-+mocs: deletedialog.moc
- 
- #>+ 3
--deletedialog.moc: $(srcdir)/deletedialog.h
--	$(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
-+googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
-+	$(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
- 
- #>+ 2
--mocs: deletedialog.moc
-+mocs: googlefetcherdialog.moc
- 
- #>+ 3
- artsplayer.moc: $(srcdir)/artsplayer.h
-@@ -1288,18 +1291,18 @@
- mocs: artsplayer.moc
- 
- #>+ 3
--googlefetcher.moc: $(srcdir)/googlefetcher.h
--	$(MOC) $(srcdir)/googlefetcher.h -o googlefetcher.moc
-+viewmode.moc: $(srcdir)/viewmode.h
-+	$(MOC) $(srcdir)/viewmode.h -o viewmode.moc
- 
- #>+ 2
--mocs: googlefetcher.moc
-+mocs: viewmode.moc
- 
- #>+ 3
--viewmode.moc: $(srcdir)/viewmode.h
--	$(MOC) $(srcdir)/viewmode.h -o viewmode.moc
-+googlefetcher.moc: $(srcdir)/googlefetcher.h
-+	$(MOC) $(srcdir)/googlefetcher.h -o googlefetcher.moc
- 
- #>+ 2
--mocs: viewmode.moc
-+mocs: googlefetcher.moc
- 
- #>+ 3
- directorylist.moc: $(srcdir)/directorylist.h
-@@ -1435,18 +1438,18 @@
- mocs: searchwidget.moc
- 
- #>+ 3
--tagtransactionmanager.moc: $(srcdir)/tagtransactionmanager.h
--	$(MOC) $(srcdir)/tagtransactionmanager.h -o tagtransactionmanager.moc
-+keydialog.moc: $(srcdir)/keydialog.h
-+	$(MOC) $(srcdir)/keydialog.h -o keydialog.moc
- 
- #>+ 2
--mocs: tagtransactionmanager.moc
-+mocs: keydialog.moc
- 
- #>+ 3
--keydialog.moc: $(srcdir)/keydialog.h
--	$(MOC) $(srcdir)/keydialog.h -o keydialog.moc
-+tagtransactionmanager.moc: $(srcdir)/tagtransactionmanager.h
-+	$(MOC) $(srcdir)/tagtransactionmanager.h -o tagtransactionmanager.moc
- 
- #>+ 2
--mocs: keydialog.moc
-+mocs: tagtransactionmanager.moc
- 
- #>+ 3
- playlistbox.moc: $(srcdir)/playlistbox.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 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 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:
-@@ -1554,6 +1557,8 @@
- 
- #>+ 22
- install-kde-icons:
-+	$(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
-@@ -1564,16 +1569,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)/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)/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
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18782,7 +40804,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18791,7 +40871,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18805,7 +40885,15 @@
  mostlyclean-libtool:
 --- kaboodle/actions/Makefile.in
 +++ kaboodle/actions/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18815,7 +40903,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18824,7 +40970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18836,27 +40982,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -619,14 +622,14 @@
- 
- #>+ 10
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- 	$(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
-+	$(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- 	-rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
-+	-rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- 
- #>+ 15
- force-reedit:
 --- kaboodle/Makefile.in
 +++ kaboodle/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -191,6 +191,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -282,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18866,7 +41002,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -337,18 +341,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -384,14 +386,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -473,6 +479,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -487,8 +494,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18875,7 +41069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -581,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18887,104 +41081,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1063,20 +1066,6 @@
- .NOEXPORT:
- 
- #>+ 3
--engine.moc: $(srcdir)/engine.h
--	$(MOC) $(srcdir)/engine.h -o engine.moc
--
--#>+ 2
--mocs: engine.moc
--
--#>+ 3
--view.moc: $(srcdir)/view.h
--	$(MOC) $(srcdir)/view.h -o view.moc
--
--#>+ 2
--mocs: view.moc
--
--#>+ 3
- userinterface.moc: $(srcdir)/userinterface.h
- 	$(MOC) $(srcdir)/userinterface.h -o userinterface.moc
- 
-@@ -1098,13 +1087,6 @@
- mocs: kaboodle_factory.moc
- 
- #>+ 3
--controls.moc: $(srcdir)/controls.h
--	$(MOC) $(srcdir)/controls.h -o controls.moc
--
--#>+ 2
--mocs: controls.moc
--
--#>+ 3
- player.moc: $(srcdir)/player.h
- 	$(MOC) $(srcdir)/player.h -o player.moc
- 
-@@ -1118,6 +1100,27 @@
- #>+ 2
- mocs: conf.moc
- 
-+#>+ 3
-+engine.moc: $(srcdir)/engine.h
-+	$(MOC) $(srcdir)/engine.h -o engine.moc
-+
-+#>+ 2
-+mocs: engine.moc
-+
-+#>+ 3
-+view.moc: $(srcdir)/view.h
-+	$(MOC) $(srcdir)/view.h -o view.moc
-+
-+#>+ 2
-+mocs: view.moc
-+
-+#>+ 3
-+controls.moc: $(srcdir)/controls.h
-+	$(MOC) $(srcdir)/controls.h -o controls.moc
-+
-+#>+ 2
-+mocs: controls.moc
-+
- #>+ 8
- libkaboodlepart.la.closure: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
- 	@echo "int main() {return 0;}" > libkaboodlepart_la_closure.cpp
-@@ -1129,10 +1132,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  engine.moc view.moc userinterface.moc kaboodleapp.moc kaboodle_factory.moc controls.moc player.moc conf.moc
-+	-rm -f  userinterface.moc kaboodleapp.moc kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc
- 
- #>+ 2
--KDE_DIST=engine.h kaboodle_factory.h conf.h controls.h player.h kaboodleui.rc kaboodle.desktop view.h Makefile.in kaboodlepartui.rc kaboodleengine.desktop kaboodleapp.h userinterface.h configure.in.in Makefile.am kaboodle_component.desktop 
-+KDE_DIST=engine.h kaboodle_factory.h controls.h conf.h player.h kaboodleui.rc kaboodle.desktop view.h Makefile.in kaboodlepartui.rc kaboodleengine.desktop kaboodleapp.h userinterface.h configure.in.in Makefile.am kaboodle_component.desktop 
- 
- #>+ 3
- clean-closures:
-@@ -1180,7 +1183,7 @@
- 
- 
- #>+ 11
--libkaboodle_noinst_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp $(srcdir)/kaboodle_factory.cpp  engine.moc view.moc kaboodle_factory.moc player.moc controls.moc conf.moc
-+libkaboodle_noinst_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp $(srcdir)/kaboodle_factory.cpp  kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc
- 	@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; \
-@@ -1238,8 +1241,8 @@
- kaboodle_factory.lo: kaboodle_factory.moc 
- nmcheck: 
- conf.o: conf.moc 
--view.lo: view.moc 
- player.o: player.moc 
-+view.lo: view.moc 
- nmcheck-am: nmcheck
- player.lo: player.moc 
- userinterface.o: userinterface.moc 
 --- kaboodle/pics/Makefile.in
 +++ kaboodle/pics/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18994,7 +41101,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19003,7 +41168,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -466,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19015,45 +41180,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -618,26 +621,26 @@
- 
- #>+ 22
- install-kde-icons:
--	$(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)/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
-@@ -209,6 +209,9 @@
+@@ -118,6 +118,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -209,6 +210,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19063,7 +41200,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,13 +464,13 @@
+@@ -264,18 +268,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -311,14 +313,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -400,6 +406,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -414,8 +421,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -461,13 +470,13 @@
  EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
  xdg_directory_DATA = kde-multimedia-music.directory
  xdg_mergedmenu_DATA = kde-multimedia-music.menu
@@ -19079,7 +41274,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -505,9 +514,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19093,7 +41288,15 @@
  mostlyclean-libtool:
 --- kaudiocreator/icons/Makefile.in
 +++ kaudiocreator/icons/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19103,7 +41306,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -439,7 +448,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19112,7 +41373,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19126,7 +41387,15 @@
  mostlyclean-libtool:
 --- kaudiocreator/Makefile.in
 +++ kaudiocreator/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -182,6 +182,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -273,6 +274,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19136,7 +41405,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -328,18 +332,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -375,14 +377,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -464,6 +470,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -478,8 +485,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -541,7 +550,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19145,7 +41472,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +588,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19157,131 +41484,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1078,13 +1081,6 @@
- .NOEXPORT:
- 
- #>+ 3
--encoder.moc: $(srcdir)/encoder.h
--	$(MOC) $(srcdir)/encoder.h -o encoder.moc
--
--#>+ 2
--mocs: encoder.moc
--
--#>+ 3
- encodefileimp.moc: $(srcdir)/encodefileimp.h
- 	$(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
- 
-@@ -1092,18 +1088,18 @@
- mocs: encodefileimp.moc
- 
- #>+ 3
--encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
--	$(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
-+encoder.moc: $(srcdir)/encoder.h
-+	$(MOC) $(srcdir)/encoder.h -o encoder.moc
- 
- #>+ 2
--mocs: encoderconfigimp.moc
-+mocs: encoder.moc
- 
- #>+ 3
--tracksimp.moc: $(srcdir)/tracksimp.h
--	$(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
-+encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
-+	$(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
- 
- #>+ 2
--mocs: tracksimp.moc
-+mocs: encoderconfigimp.moc
- 
- #>+ 3
- kaudiocreator.moc: $(srcdir)/kaudiocreator.h
-@@ -1113,11 +1109,11 @@
- mocs: kaudiocreator.moc
- 
- #>+ 3
--jobqueimp.moc: $(srcdir)/jobqueimp.h
--	$(MOC) $(srcdir)/jobqueimp.h -o jobqueimp.moc
-+tracksimp.moc: $(srcdir)/tracksimp.h
-+	$(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
- 
- #>+ 2
--mocs: jobqueimp.moc
-+mocs: tracksimp.moc
- 
- #>+ 3
- ripper.moc: $(srcdir)/ripper.h
-@@ -1127,8 +1123,15 @@
- mocs: ripper.moc
- 
- #>+ 3
-+jobqueimp.moc: $(srcdir)/jobqueimp.h
-+	$(MOC) $(srcdir)/jobqueimp.h -o jobqueimp.moc
-+
-+#>+ 2
-+mocs: jobqueimp.moc
-+
-+#>+ 3
- clean-metasources:
--	-rm -f  encoder.moc encodefileimp.moc encoderconfigimp.moc tracksimp.moc kaudiocreator.moc jobqueimp.moc ripper.moc
-+	-rm -f  encodefileimp.moc encoder.moc encoderconfigimp.moc kaudiocreator.moc tracksimp.moc ripper.moc jobqueimp.moc
- 
- #>+ 2
- 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 
-@@ -1161,18 +1164,18 @@
- install-kde-icons:
- 	$(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
- 
- uninstall-kde-icons:
- 	-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
- 
- #>+ 15
- force-reedit:
-@@ -1213,7 +1216,7 @@
- 
- 
- #>+ 11
--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; \
-@@ -1260,8 +1263,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 
- encoder.o: encoder.moc 
- nmcheck: 
- $(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 
-@@ -1269,8 +1272,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 
--tracksimp.lo: tracksimp.moc 
- encoderconfigimp.o: encoderconfigimp.moc 
-+tracksimp.lo: tracksimp.moc 
- $(srcdir)/job.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 
- 
- #>+ 177
 --- kfile-plugins/au/Makefile.in
 +++ kfile-plugins/au/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19291,7 +41504,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19300,7 +41571,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19314,7 +41585,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/avi/Makefile.in
 +++ kfile-plugins/avi/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19324,7 +41603,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19333,7 +41670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19347,7 +41684,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/flac/Makefile.in
 +++ kfile-plugins/flac/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19357,7 +41702,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19366,7 +41769,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19380,7 +41783,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/m3u/Makefile.in
 +++ kfile-plugins/m3u/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19390,7 +41801,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19399,7 +41868,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19413,7 +41882,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/Makefile.in
 +++ kfile-plugins/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19423,7 +41900,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -451,7 +460,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19432,7 +41967,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -489,9 +498,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19446,7 +41981,15 @@
  mostlyclean-libtool:
 --- kfile-plugins/mp3/Makefile.in
 +++ kfile-plugins/mp3/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19456,7 +41999,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19465,7 +42066,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19479,7 +42080,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/mpc/Makefile.in
 +++ kfile-plugins/mpc/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19489,7 +42098,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19498,7 +42165,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19512,7 +42179,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/mpeg/Makefile.in
 +++ kfile-plugins/mpeg/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19522,7 +42197,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19531,7 +42264,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19545,7 +42278,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/ogg/Makefile.in
 +++ kfile-plugins/ogg/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -160,6 +160,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -251,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19555,7 +42296,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -306,18 +310,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -353,14 +355,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -442,6 +448,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -456,8 +463,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -500,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -19564,7 +42363,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -538,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19578,7 +42377,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/sid/Makefile.in
 +++ kfile-plugins/sid/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19588,7 +42395,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19597,7 +42462,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19611,7 +42476,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/theora/Makefile.in
 +++ kfile-plugins/theora/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19621,7 +42494,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19630,7 +42561,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19644,7 +42575,15 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/wav/Makefile.in
 +++ kfile-plugins/wav/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19654,7 +42593,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19663,7 +42660,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19677,7 +42674,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/kcmaudiocd/Makefile.in
 +++ kioslave/audiocd/kcmaudiocd/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -150,6 +150,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19687,7 +42692,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -296,18 +300,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -343,14 +345,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -432,6 +438,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -446,8 +453,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -484,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19696,7 +42759,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19710,7 +42773,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/Makefile.in
 +++ kioslave/audiocd/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -171,6 +171,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -262,6 +263,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19720,7 +42791,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -317,18 +321,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -364,14 +366,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -453,6 +459,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -467,8 +474,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -514,7 +523,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19729,7 +42858,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -552,9 +561,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19743,7 +42872,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/flac/Makefile.in
 +++ kioslave/audiocd/plugins/flac/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -144,6 +144,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19753,7 +42890,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -290,18 +294,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -337,14 +339,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -426,6 +432,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -440,8 +447,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -478,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19762,7 +42957,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -516,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19776,7 +42971,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/lame/Makefile.in
 +++ kioslave/audiocd/plugins/lame/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19786,7 +42989,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -490,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19795,7 +43056,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19809,7 +43070,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/Makefile.in
 +++ kioslave/audiocd/plugins/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -165,6 +165,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -256,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19819,7 +43088,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -311,18 +315,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -358,14 +360,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -447,6 +453,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -461,8 +468,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -499,7 +508,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19828,7 +43155,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +546,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19842,7 +43169,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/vorbis/Makefile.in
 +++ kioslave/audiocd/plugins/vorbis/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -152,6 +152,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -243,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19852,7 +43187,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -298,18 +302,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -345,14 +347,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -434,6 +440,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -448,8 +455,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19861,7 +43254,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19875,7 +43268,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/wav/Makefile.in
 +++ kioslave/audiocd/plugins/wav/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -147,6 +147,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -238,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19885,7 +43286,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -293,18 +297,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -340,14 +342,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -429,6 +435,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -443,8 +450,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -482,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19894,7 +43353,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19908,7 +43367,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/Makefile.in
 +++ kioslave/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19918,7 +43385,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19927,7 +43452,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19941,7 +43466,15 @@
  mostlyclean-libtool:
 --- kmid/examples/Makefile.in
 +++ kmid/examples/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19951,7 +43484,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -442,7 +451,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19960,7 +43551,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +489,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19974,7 +43565,15 @@
  mostlyclean-libtool:
 --- kmid/Makefile.in
 +++ kmid/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -202,6 +202,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -293,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19984,7 +43583,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -348,18 +352,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -395,14 +397,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -484,6 +490,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -498,8 +505,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19993,7 +43650,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20005,94 +43662,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1266,13 +1269,6 @@
- mocs: channelcfgdlg.moc
- 
- #>+ 3
--kdisptext.moc: $(srcdir)/kdisptext.h
--	$(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
--
--#>+ 2
--mocs: kdisptext.moc
--
--#>+ 3
- kmid_part.moc: $(srcdir)/kmid_part.h
- 	$(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
- 
-@@ -1280,11 +1276,11 @@
- mocs: kmid_part.moc
- 
- #>+ 3
--ktrianglebutton.moc: $(srcdir)/ktrianglebutton.h
--	$(MOC) $(srcdir)/ktrianglebutton.h -o ktrianglebutton.moc
-+kdisptext.moc: $(srcdir)/kdisptext.h
-+	$(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
- 
- #>+ 2
--mocs: ktrianglebutton.moc
-+mocs: kdisptext.moc
- 
- #>+ 3
- qslidertime.moc: $(srcdir)/qslidertime.h
-@@ -1294,6 +1290,13 @@
- mocs: qslidertime.moc
- 
- #>+ 3
-+ktrianglebutton.moc: $(srcdir)/ktrianglebutton.h
-+	$(MOC) $(srcdir)/ktrianglebutton.h -o ktrianglebutton.moc
-+
-+#>+ 2
-+mocs: ktrianglebutton.moc
-+
-+#>+ 3
- kmidframe.moc: $(srcdir)/kmidframe.h
- 	$(MOC) $(srcdir)/kmidframe.h -o kmidframe.moc
- 
-@@ -1318,7 +1321,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
-+	-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 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 
-@@ -1337,17 +1340,17 @@
- 
- #>+ 13
- install-kde-icons:
--	$(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)/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:
-@@ -1388,7 +1391,7 @@
- 
- 
- #>+ 11
--libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
-+libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp  klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
- 	@echo 'creating libkmidlib_la.all_cpp.cpp ...'; \
- 	rm -f libkmidlib_la.all_cpp.files libkmidlib_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkmidlib_la.all_cpp.final; \
 --- kmid/maps/Makefile.in
 +++ kmid/maps/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20102,7 +43682,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -440,7 +449,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20111,7 +43749,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -478,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20125,7 +43763,15 @@
  mostlyclean-libtool:
 --- kmid/pics/Makefile.in
 +++ kmid/pics/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20135,7 +43781,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20144,7 +43848,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20156,35 +43860,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -621,21 +624,21 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
- 	$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
- 	$(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
--	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
--	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
- 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
- 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
-+	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
- 	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
-+	-rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
- 
- #>+ 15
- force-reedit:
 --- kmix/Makefile.in
 +++ kmix/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -233,6 +233,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -324,6 +325,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20194,7 +43880,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -379,18 +383,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -426,14 +428,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -515,6 +521,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -529,8 +536,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -630,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20203,7 +43947,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -668,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20215,145 +43959,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1336,18 +1339,18 @@
- mocs: viewswitches.moc
- 
- #>+ 3
--viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
--	$(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
-+kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
-+	$(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
- 
- #>+ 2
--mocs: viewdockareapopup.moc
-+mocs: kmixdockwidget.moc
- 
- #>+ 3
--kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
--	$(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
-+viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
-+	$(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
- 
- #>+ 2
--mocs: kmixdockwidget.moc
-+mocs: viewdockareapopup.moc
- 
- #>+ 3
- ksmallslider.moc: $(srcdir)/ksmallslider.h
-@@ -1385,13 +1388,6 @@
- mocs: viewapplet.moc
- 
- #>+ 3
--kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
--	$(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
--
--#>+ 2
--mocs: kmixprefdlg.moc
--
--#>+ 3
- mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
- 	$(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
- 
-@@ -1399,11 +1395,11 @@
- mocs: mixdevicewidget.moc
- 
- #>+ 3
--KMixApp.moc: $(srcdir)/KMixApp.h
--	$(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
-+kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
-+	$(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
- 
- #>+ 2
--mocs: KMixApp.moc
-+mocs: kmixprefdlg.moc
- 
- #>+ 3
- dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
-@@ -1413,6 +1409,13 @@
- mocs: dialogviewconfiguration.moc
- 
- #>+ 3
-+KMixApp.moc: $(srcdir)/KMixApp.h
-+	$(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
-+
-+#>+ 2
-+mocs: KMixApp.moc
-+
-+#>+ 3
- kmixapplet.moc: $(srcdir)/kmixapplet.h
- 	$(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
- 
-@@ -1434,18 +1437,18 @@
- mocs: kmix.moc
- 
- #>+ 3
--mdwswitch.moc: $(srcdir)/mdwswitch.h
--	$(MOC) $(srcdir)/mdwswitch.h -o mdwswitch.moc
-+viewsliders.moc: $(srcdir)/viewsliders.h
-+	$(MOC) $(srcdir)/viewsliders.h -o viewsliders.moc
- 
- #>+ 2
--mocs: mdwswitch.moc
-+mocs: viewsliders.moc
- 
- #>+ 3
--viewsliders.moc: $(srcdir)/viewsliders.h
--	$(MOC) $(srcdir)/viewsliders.h -o viewsliders.moc
-+mdwswitch.moc: $(srcdir)/mdwswitch.h
-+	$(MOC) $(srcdir)/mdwswitch.h -o mdwswitch.moc
- 
- #>+ 2
--mocs: viewsliders.moc
-+mocs: mdwswitch.moc
- 
- #>+ 3
- mixdevice.moc: $(srcdir)/mixdevice.h
-@@ -1476,18 +1479,18 @@
- mocs: viewsurround.moc
- 
- #>+ 3
--kmixerwidget.moc: $(srcdir)/kmixerwidget.h
--	$(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
-+mixer.moc: $(srcdir)/mixer.h
-+	$(MOC) $(srcdir)/mixer.h -o mixer.moc
- 
- #>+ 2
--mocs: kmixerwidget.moc
-+mocs: mixer.moc
- 
- #>+ 3
--mixer.moc: $(srcdir)/mixer.h
--	$(MOC) $(srcdir)/mixer.h -o mixer.moc
-+kmixerwidget.moc: $(srcdir)/kmixerwidget.h
-+	$(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
- 
- #>+ 2
--mocs: mixer.moc
-+mocs: kmixerwidget.moc
- 
- #>+ 3
- kledbutton.moc: $(srcdir)/kledbutton.h
-@@ -1523,7 +1526,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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 
-@@ -1586,7 +1589,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)/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
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20363,7 +43979,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -448,7 +457,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20372,7 +44046,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20384,42 +44058,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -658,23 +661,23 @@
- 
- #>+ 19
- install-kde-icons:
--	$(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)/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
-@@ -319,6 +319,9 @@
+@@ -228,6 +228,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -319,6 +320,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20429,7 +44078,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -374,18 +378,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -421,14 +423,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -510,6 +516,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,8 +531,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -627,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20438,7 +44145,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -665,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20450,161 +44157,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1290,7 +1293,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:
-@@ -1345,18 +1348,18 @@
- mocs: krecglobal.moc
- 
- #>+ 3
--krecord.moc: $(srcdir)/krecord.h
--	$(MOC) $(srcdir)/krecord.h -o krecord.moc
-+krecord_private.moc: $(srcdir)/krecord_private.h
-+	$(MOC) $(srcdir)/krecord_private.h -o krecord_private.moc
- 
- #>+ 2
--mocs: krecord.moc
-+mocs: krecord_private.moc
- 
- #>+ 3
--krecord_private.moc: $(srcdir)/krecord_private.h
--	$(MOC) $(srcdir)/krecord_private.h -o krecord_private.moc
-+krecord.moc: $(srcdir)/krecord.h
-+	$(MOC) $(srcdir)/krecord.h -o krecord.moc
- 
- #>+ 2
--mocs: krecord_private.moc
-+mocs: krecord.moc
- 
- #>+ 3
- krecconfig_files.moc: $(srcdir)/krecconfig_files.h
-@@ -1373,13 +1376,6 @@
- mocs: krecfileview.moc
- 
- #>+ 3
--krecexport_template.moc: $(srcdir)/krecexport_template.h
--	$(MOC) $(srcdir)/krecexport_template.h -o krecexport_template.moc
--
--#>+ 2
--mocs: krecexport_template.moc
--
--#>+ 3
- krecfilewidgets.moc: $(srcdir)/krecfilewidgets.h
- 	$(MOC) $(srcdir)/krecfilewidgets.h -o krecfilewidgets.moc
- 
-@@ -1387,11 +1383,11 @@
- mocs: krecfilewidgets.moc
- 
- #>+ 3
--krecexport_wave.moc: $(srcdir)/krecexport_wave.h
--	$(MOC) $(srcdir)/krecexport_wave.h -o krecexport_wave.moc
-+krecexport_template.moc: $(srcdir)/krecexport_template.h
-+	$(MOC) $(srcdir)/krecexport_template.h -o krecexport_template.moc
- 
- #>+ 2
--mocs: krecexport_wave.moc
-+mocs: krecexport_template.moc
- 
- #>+ 3
- krecconfigure.moc: $(srcdir)/krecconfigure.h
-@@ -1401,6 +1397,13 @@
- mocs: krecconfigure.moc
- 
- #>+ 3
-+krecexport_wave.moc: $(srcdir)/krecexport_wave.h
-+	$(MOC) $(srcdir)/krecexport_wave.h -o krecexport_wave.moc
-+
-+#>+ 2
-+mocs: krecexport_wave.moc
-+
-+#>+ 3
- krecconfig_fileswidget.moc: $(srcdir)/krecconfig_fileswidget.h
- 	$(MOC) $(srcdir)/krecconfig_fileswidget.h -o krecconfig_fileswidget.moc
- 
-@@ -1468,10 +1471,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  krecnewproperties.moc krecglobal.moc krecord.moc krecord_private.moc krecconfig_files.moc krecfileview.moc krecexport_template.moc krecfilewidgets.moc krecexport_wave.moc krecconfigure.moc krecconfig_fileswidget.moc krecfile.moc krecfileviewhelpers.moc
-+	-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=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:
-@@ -1482,25 +1485,25 @@
- 
- #>+ 22
- install-kde-icons:
--	$(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)/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
-@@ -1542,7 +1545,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  ../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; \
-@@ -1554,7 +1557,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  ../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; \
-@@ -1630,7 +1633,7 @@
- krecnewproperties.o: krecnewproperties.moc 
- krecexport_wave.lo: krecexport_wave.moc 
- krecconfig_files.o: krecconfig_files.moc 
--krecord.o: krecord.moc krecord_private.moc 
-+krecord.o: krecord_private.moc krecord.moc 
- krecfileviewhelpers.o: krecfileviewhelpers.moc 
- nmcheck: 
- krecfile.o: krecfile.moc 
 --- krec/mp3_export/Makefile.in
 +++ krec/mp3_export/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -147,6 +147,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -238,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20614,7 +44177,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -293,18 +297,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -340,14 +342,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -429,6 +435,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -443,8 +450,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20623,7 +44244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20637,7 +44258,15 @@
  	@$(NORMAL_INSTALL)
 --- krec/ogg_export/Makefile.in
 +++ krec/ogg_export/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -147,6 +147,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -238,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20647,7 +44276,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -293,18 +297,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -340,14 +342,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -429,6 +435,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -443,8 +450,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20656,7 +44343,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20670,7 +44357,15 @@
  	@$(NORMAL_INSTALL)
 --- krec/pics/Makefile.in
 +++ krec/pics/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20680,7 +44375,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20689,7 +44442,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20701,42 +44454,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -619,24 +622,24 @@
- 
- #>+ 20
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
--	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
- 	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
-+	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes
- 	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileplay.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_filerec.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
- 	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
--	$(INSTALL_DATA) $(srcdir)/cr32-mime-krec_filerec.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
-+	$(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
--	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
- 	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
- 	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
--	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
- 	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
-+	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
-+	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
-+	-rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
- 
- #>+ 15
- force-reedit:
 --- kscd/bitmaps/Makefile.in
 +++ kscd/bitmaps/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20746,7 +44474,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -428,7 +437,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20755,7 +44541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -466,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20769,7 +44555,15 @@
  mostlyclean-libtool:
 --- kscd/kscdmagic/Makefile.in
 +++ kscd/kscdmagic/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -166,6 +166,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -257,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20779,7 +44573,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -312,18 +316,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -359,14 +361,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -448,6 +454,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -462,8 +469,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -510,7 +519,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -20788,7 +44640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,9 +557,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20802,7 +44654,15 @@
  	@$(NORMAL_INSTALL)
 --- kscd/libwm/audio/Makefile.in
 +++ kscd/libwm/audio/Makefile.in
-@@ -219,6 +219,9 @@
+@@ -128,6 +128,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -219,6 +220,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20812,7 +44672,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -456,7 +459,7 @@
+@@ -274,18 +278,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -321,14 +323,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -410,6 +416,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -424,8 +431,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -456,7 +465,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -20821,7 +44739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -494,9 +497,9 @@
+@@ -494,9 +503,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20835,7 +44753,15 @@
  clean-noinstLTLIBRARIES:
 --- kscd/libwm/Makefile.in
 +++ kscd/libwm/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -159,6 +159,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -250,6 +251,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20845,7 +44771,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -305,18 +309,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -352,14 +354,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -441,6 +447,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -455,8 +462,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -497,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -20854,7 +44838,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20868,7 +44852,15 @@
  clean-noinstLTLIBRARIES:
 --- kscd/Makefile.in
 +++ kscd/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -188,6 +188,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -279,6 +280,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20878,7 +44870,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -334,18 +338,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -381,14 +383,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -470,6 +476,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -484,8 +491,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -557,7 +566,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20887,7 +44937,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20899,47 +44949,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -1188,7 +1191,7 @@
- 	-rm -f  bwlednum.moc kscd.moc docking.moc kcompactdisc.moc ledlamp.moc configWidget.moc cddbdlg.moc
- 
- #>+ 2
--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:
-@@ -1215,22 +1218,22 @@
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.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)/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
-@@ -241,6 +241,9 @@
+@@ -150,6 +150,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20949,7 +44969,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -296,18 +300,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -343,14 +345,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -432,6 +438,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -446,8 +453,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -495,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20958,7 +45036,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -533,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20970,18 +45048,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -863,7 +866,7 @@
- 	-rm -f  cddbconfigwidget.moc kcmcddb.moc
- 
- #>+ 2
--KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop kcmcddb.h cddbconfigwidgetbase.ui Makefile.am 
-+KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop cddbconfigwidgetbase.ui kcmcddb.h Makefile.am 
- 
- #>+ 4
- clean-ui:
 --- libkcddb/Makefile.in
 +++ libkcddb/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -179,6 +179,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -270,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20991,7 +45068,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -325,18 +329,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -372,14 +374,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -461,6 +467,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -475,8 +482,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -533,7 +542,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21000,7 +45135,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -571,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21012,72 +45147,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1088,32 +1091,32 @@
- .NOEXPORT:
- 
- #>+ 3
--httplookup.moc: $(srcdir)/httplookup.h
--	$(MOC) $(srcdir)/httplookup.h -o httplookup.moc
-+client.moc: $(srcdir)/client.h
-+	$(MOC) $(srcdir)/client.h -o client.moc
- 
- #>+ 2
--mocs: httplookup.moc
-+mocs: client.moc
- 
- #>+ 3
--asynccddbplookup.moc: $(srcdir)/asynccddbplookup.h
--	$(MOC) $(srcdir)/asynccddbplookup.h -o asynccddbplookup.moc
-+httplookup.moc: $(srcdir)/httplookup.h
-+	$(MOC) $(srcdir)/httplookup.h -o httplookup.moc
- 
- #>+ 2
--mocs: asynccddbplookup.moc
-+mocs: httplookup.moc
- 
- #>+ 3
--client.moc: $(srcdir)/client.h
--	$(MOC) $(srcdir)/client.h -o client.moc
-+asyncsmtpsubmit.moc: $(srcdir)/asyncsmtpsubmit.h
-+	$(MOC) $(srcdir)/asyncsmtpsubmit.h -o asyncsmtpsubmit.moc
- 
- #>+ 2
--mocs: client.moc
-+mocs: asyncsmtpsubmit.moc
- 
- #>+ 3
--asyncsmtpsubmit.moc: $(srcdir)/asyncsmtpsubmit.h
--	$(MOC) $(srcdir)/asyncsmtpsubmit.h -o asyncsmtpsubmit.moc
-+asynccddbplookup.moc: $(srcdir)/asynccddbplookup.h
-+	$(MOC) $(srcdir)/asynccddbplookup.h -o asynccddbplookup.moc
- 
- #>+ 2
--mocs: asyncsmtpsubmit.moc
-+mocs: asynccddbplookup.moc
- 
- #>+ 3
- asynchttplookup.moc: $(srcdir)/asynchttplookup.h
-@@ -1138,7 +1141,7 @@
- 
- #>+ 3
- clean-metasources:
--	-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 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 
-@@ -1196,7 +1199,7 @@
- 
- 
- #>+ 11
--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
-@@ -291,6 +291,9 @@
+@@ -200,6 +200,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -291,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21087,7 +45167,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -346,18 +350,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -393,14 +395,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -482,6 +488,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -496,8 +503,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -557,7 +566,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21096,7 +45234,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21108,39 +45246,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-@@ -876,22 +879,22 @@
- mocs: asynccddblookuptest.moc
- 
- #>+ 3
--asynchttplookuptest.moc: $(srcdir)/asynchttplookuptest.h
--	$(MOC) $(srcdir)/asynchttplookuptest.h -o asynchttplookuptest.moc
-+asyncsmtpsubmittest.moc: $(srcdir)/asyncsmtpsubmittest.h
-+	$(MOC) $(srcdir)/asyncsmtpsubmittest.h -o asyncsmtpsubmittest.moc
- 
- #>+ 2
--mocs: asynchttplookuptest.moc
-+mocs: asyncsmtpsubmittest.moc
- 
- #>+ 3
--asyncsmtpsubmittest.moc: $(srcdir)/asyncsmtpsubmittest.h
--	$(MOC) $(srcdir)/asyncsmtpsubmittest.h -o asyncsmtpsubmittest.moc
-+asynchttplookuptest.moc: $(srcdir)/asynchttplookuptest.h
-+	$(MOC) $(srcdir)/asynchttplookuptest.h -o asynchttplookuptest.moc
- 
- #>+ 2
--mocs: asyncsmtpsubmittest.moc
-+mocs: asynchttplookuptest.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  asynchttpsubmittest.moc asynccddblookuptest.moc asynchttplookuptest.moc asyncsmtpsubmittest.moc
-+	-rm -f  asynchttpsubmittest.moc asynccddblookuptest.moc asyncsmtpsubmittest.moc asynchttplookuptest.moc
- 
- #>+ 2
- KDE_DIST=asynccddblookuptest.h asynchttplookuptest.h asyncsmtpsubmittest.h Makefile.in asynchttpsubmittest.h Makefile.am 
 --- Makefile.in
 +++ Makefile.in
-@@ -227,6 +227,9 @@
+@@ -136,6 +136,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -227,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21150,7 +45266,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -282,18 +286,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -329,14 +331,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -418,6 +424,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -432,8 +439,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -472,7 +481,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -21159,7 +45333,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -514,12 +517,12 @@
+@@ -514,12 +523,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -21174,7 +45348,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -531,7 +534,7 @@
+@@ -531,7 +540,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -21183,18 +45357,26 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -948,7 +951,7 @@
+@@ -948,7 +957,7 @@
  .NOEXPORT:
  
  #>+ 2
 -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 
++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 configure acinclude.m4 Makefile.am Makefile.am.in 
  
  #>+ 2
  docs-am:
 --- mpeglib/example/cddaplay/Makefile.in
 +++ mpeglib/example/cddaplay/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -140,6 +140,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -231,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21204,7 +45386,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -286,18 +290,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -333,14 +335,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -422,6 +428,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -436,8 +443,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -472,7 +481,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21213,7 +45453,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -510,9 +519,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21227,7 +45467,15 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/Makefile.in
 +++ mpeglib/example/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21237,7 +45485,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21246,7 +45552,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21260,7 +45566,15 @@
  mostlyclean-libtool:
 --- mpeglib/example/mpgplay/Makefile.in
 +++ mpeglib/example/mpgplay/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -140,6 +140,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -231,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21270,7 +45584,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -286,18 +290,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -333,14 +335,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -422,6 +428,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -436,8 +443,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -473,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21279,7 +45651,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21293,7 +45665,15 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/splay/Makefile.in
 +++ mpeglib/example/splay/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -145,6 +145,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -236,6 +237,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21303,7 +45683,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -291,18 +295,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -338,14 +340,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -427,6 +433,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -441,8 +448,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -483,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21312,7 +45750,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21326,7 +45764,15 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/tplay/Makefile.in
 +++ mpeglib/example/tplay/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -140,6 +140,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -231,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21336,7 +45782,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -286,18 +290,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -333,14 +335,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -422,6 +428,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -436,8 +443,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -473,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21345,7 +45849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21359,7 +45863,15 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/yaf/Makefile.in
 +++ mpeglib/example/yaf/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -121,6 +121,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -212,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21369,7 +45881,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -267,18 +271,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -314,14 +316,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -403,6 +409,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -417,8 +424,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -449,7 +458,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -21378,7 +45948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -487,9 +496,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21392,7 +45962,15 @@
  mostlyclean-libtool:
 --- mpeglib/example/yaf/yafcdda/Makefile.in
 +++ mpeglib/example/yaf/yafcdda/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -144,6 +144,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21402,7 +45980,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -290,18 +294,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -337,14 +339,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -426,6 +432,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -440,8 +447,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -478,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21411,7 +46047,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -516,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21425,7 +46061,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafcore/Makefile.in
 +++ mpeglib/example/yaf/yafcore/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -157,6 +157,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -248,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21435,7 +46079,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -303,18 +307,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -350,14 +352,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -439,6 +445,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -453,8 +460,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21444,7 +46146,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +564,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21458,7 +46160,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafmpgplay/Makefile.in
 +++ mpeglib/example/yaf/yafmpgplay/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -144,6 +144,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21468,7 +46178,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -290,18 +294,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -337,14 +339,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -426,6 +432,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -440,8 +447,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21477,7 +46245,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21491,7 +46259,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafsplay/Makefile.in
 +++ mpeglib/example/yaf/yafsplay/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -144,6 +144,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21501,7 +46277,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -290,18 +294,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -337,14 +339,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -426,6 +432,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -440,8 +447,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21510,7 +46344,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21524,7 +46358,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yaftplay/Makefile.in
 +++ mpeglib/example/yaf/yaftplay/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -144,6 +144,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21534,7 +46376,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -290,18 +294,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -337,14 +339,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -426,6 +432,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -440,8 +447,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -478,7 +487,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21543,7 +46443,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -516,9 +525,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21557,7 +46457,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafvorbis/Makefile.in
 +++ mpeglib/example/yaf/yafvorbis/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -144,6 +144,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21567,7 +46475,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -290,18 +294,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -337,14 +339,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -426,6 +432,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -440,8 +447,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -480,7 +489,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21576,7 +46542,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -518,9 +527,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21590,7 +46556,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafxplayer/Makefile.in
 +++ mpeglib/example/yaf/yafxplayer/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -156,6 +156,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -247,6 +248,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21600,7 +46574,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -302,18 +306,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -349,14 +351,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -438,6 +444,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -452,8 +459,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -509,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21609,7 +46641,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -547,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21623,7 +46655,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafyuv/Makefile.in
 +++ mpeglib/example/yaf/yafyuv/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -144,6 +144,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -235,6 +236,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21633,7 +46673,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -290,18 +294,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -337,14 +339,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -426,6 +432,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -440,8 +447,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21642,7 +46740,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21656,7 +46754,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/lib/decoder/Makefile.in
 +++ mpeglib/lib/decoder/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21666,7 +46772,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -493,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21675,7 +46839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21689,7 +46853,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/frame/Makefile.in
 +++ mpeglib/lib/frame/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21699,7 +46871,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -493,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21708,7 +46938,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21722,7 +46952,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/input/Makefile.in
 +++ mpeglib/lib/input/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -159,6 +159,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -250,6 +251,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21732,7 +46970,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -305,18 +309,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -352,14 +354,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -441,6 +447,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -455,8 +462,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -515,7 +524,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21741,7 +47037,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +562,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21755,7 +47051,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/Makefile.in
 +++ mpeglib/lib/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -164,6 +164,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -255,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21765,7 +47069,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -310,18 +314,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -357,14 +359,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -446,6 +452,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -460,8 +467,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -514,7 +523,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21774,7 +47136,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -552,9 +561,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21788,7 +47150,15 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/lib/mpegplay/Makefile.in
 +++ mpeglib/lib/mpegplay/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -174,6 +174,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -265,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21798,7 +47168,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -320,18 +324,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -367,14 +369,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -456,6 +462,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -470,8 +477,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -540,7 +549,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .S .cpp .lo .o .obj
@@ -21807,7 +47235,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -578,9 +587,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21821,7 +47249,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/mpgplayer/Makefile.in
 +++ mpeglib/lib/mpgplayer/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -146,6 +146,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -237,6 +238,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21831,7 +47267,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -476,7 +479,7 @@
+@@ -292,18 +296,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -339,14 +341,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -428,6 +434,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -442,8 +449,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -476,7 +485,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21840,7 +47334,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -514,9 +517,9 @@
+@@ -514,9 +523,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21854,7 +47348,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/oggvorbis/Makefile.in
 +++ mpeglib/lib/oggvorbis/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -151,6 +151,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -242,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21864,7 +47366,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -297,18 +301,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -344,14 +346,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -433,6 +439,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -447,8 +454,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -485,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21873,7 +47433,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21887,7 +47447,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/output/Makefile.in
 +++ mpeglib/lib/output/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -157,6 +157,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -248,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21897,7 +47465,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -303,18 +307,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -350,14 +352,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -439,6 +445,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -453,8 +460,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -504,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21906,7 +47532,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21920,7 +47546,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/splay/Makefile.in
 +++ mpeglib/lib/splay/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -159,6 +159,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -250,6 +251,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21930,7 +47564,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -305,18 +309,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -352,14 +354,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -441,6 +447,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -455,8 +462,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -515,7 +524,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21939,7 +47631,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +562,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21953,7 +47645,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/tplay/Makefile.in
 +++ mpeglib/lib/tplay/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -141,6 +141,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -232,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21963,7 +47663,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -287,18 +291,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -334,14 +336,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -423,6 +429,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -437,8 +444,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -473,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21972,7 +47730,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21986,7 +47744,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/abstract/Makefile.in
 +++ mpeglib/lib/util/abstract/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -149,6 +149,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -240,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21996,7 +47762,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -295,18 +299,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -342,14 +344,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -431,6 +437,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -445,8 +452,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22005,7 +47829,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22019,7 +47843,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/audio/Makefile.in
 +++ mpeglib/lib/util/audio/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -141,6 +141,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -232,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22029,7 +47861,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -475,7 +478,7 @@
+@@ -287,18 +291,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -334,14 +336,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -423,6 +429,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -437,8 +444,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -475,7 +484,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22038,7 +47928,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -513,9 +516,9 @@
+@@ -513,9 +522,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22052,7 +47942,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/file/Makefile.in
 +++ mpeglib/lib/util/file/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -146,6 +146,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -237,6 +238,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22062,7 +47960,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -292,18 +296,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -339,14 +341,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -428,6 +434,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -442,8 +449,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -477,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22071,7 +48027,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22085,7 +48041,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/Makefile.in
 +++ mpeglib/lib/util/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -167,6 +167,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -258,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22095,7 +48059,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -313,18 +317,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -360,14 +362,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -449,6 +455,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -463,8 +470,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -512,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22104,7 +48126,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22118,7 +48140,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/mmx/Makefile.in
 +++ mpeglib/lib/util/mmx/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -142,6 +142,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -233,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22128,7 +48158,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -288,18 +292,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -335,14 +337,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -424,6 +430,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -438,8 +445,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -474,7 +483,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -22137,7 +48225,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -512,9 +521,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22151,7 +48239,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/dither/Makefile.in
 +++ mpeglib/lib/util/render/dither/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -147,6 +147,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -238,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22161,7 +48257,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -293,18 +297,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -340,14 +342,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -429,6 +435,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -443,8 +450,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -490,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22170,7 +48324,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22184,7 +48338,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/dither2YUV/Makefile.in
 +++ mpeglib/lib/util/render/dither2YUV/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -143,6 +143,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -234,6 +235,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22194,7 +48356,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -289,18 +293,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -336,14 +338,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -425,6 +431,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -439,8 +446,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -477,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22203,7 +48423,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22217,7 +48437,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/Makefile.in
 +++ mpeglib/lib/util/render/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -167,6 +167,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -258,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22227,7 +48455,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -313,18 +317,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -360,14 +362,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -449,6 +455,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -463,8 +470,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -509,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22236,7 +48522,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -547,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22250,7 +48536,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/sdl/Makefile.in
 +++ mpeglib/lib/util/render/sdl/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -141,6 +141,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -232,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22260,7 +48554,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -287,18 +291,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -334,14 +336,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -423,6 +429,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -437,8 +444,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -470,7 +479,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22269,7 +48621,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -508,9 +517,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22283,7 +48635,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/x11/Makefile.in
 +++ mpeglib/lib/util/render/x11/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -143,6 +143,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -234,6 +235,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22293,7 +48653,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -289,18 +293,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -336,14 +338,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -425,6 +431,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -439,8 +446,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22302,7 +48720,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22316,7 +48734,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/yuv/Makefile.in
 +++ mpeglib/lib/yuv/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -146,6 +146,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -237,6 +238,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22326,7 +48752,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -292,18 +296,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -339,14 +341,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -428,6 +434,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -442,8 +449,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -477,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22335,7 +48819,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22349,7 +48833,15 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/Makefile.in
 +++ mpeglib/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -122,6 +122,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -213,6 +214,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22359,7 +48851,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -268,18 +272,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -315,14 +317,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -404,6 +410,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -418,8 +425,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -450,7 +459,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22368,7 +48918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -488,9 +497,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22382,7 +48932,15 @@
  mostlyclean-libtool:
 --- mpeglib_artsplug/Makefile.in
 +++ mpeglib_artsplug/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -188,6 +188,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -279,6 +280,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22392,7 +48950,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -334,18 +338,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -381,14 +383,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -470,6 +476,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -484,8 +491,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -22401,7 +49017,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22413,18 +49029,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1039,7 +1042,7 @@
- 
- 
- #>+ 2
--KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass VCDPlayObject.mcopclass Makefile.am 
-+KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass Makefile.am VCDPlayObject.mcopclass 
- 
- #>+ 3
- clean-closures:
 --- mpg123_artsplugin/Makefile.in
 +++ mpg123_artsplugin/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -178,6 +178,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -269,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22434,7 +49049,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -324,18 +328,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -371,14 +373,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -460,6 +466,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -474,8 +481,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -518,7 +527,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -22443,7 +49116,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22457,7 +49130,15 @@
  	@$(NORMAL_INSTALL)
 --- mpg123_artsplugin/mpg123/Makefile.in
 +++ mpg123_artsplugin/mpg123/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -215,6 +215,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -306,6 +307,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22467,7 +49148,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -361,18 +365,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -408,14 +410,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -497,6 +503,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -511,8 +518,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -569,7 +578,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj .s
@@ -22476,7 +49215,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22490,7 +49229,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/app/Makefile.in
 +++ noatun/app/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -158,6 +158,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -249,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22500,7 +49247,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -304,18 +308,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -351,14 +353,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -440,6 +446,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -454,8 +461,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -494,7 +503,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22509,7 +49314,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -532,9 +541,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22523,7 +49328,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/library/Makefile.in
 +++ noatun/library/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -201,6 +201,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -292,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22533,7 +49346,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -347,18 +351,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -394,14 +396,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -483,6 +489,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -497,8 +504,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22542,7 +49413,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22554,77 +49425,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1094,18 +1097,18 @@
- mocs: mimetypetree.moc
- 
- #>+ 3
--cmodule.moc: $(srcdir)/cmodule.h
--	$(MOC) $(srcdir)/cmodule.h -o cmodule.moc
-+pluginmodule.moc: $(srcdir)/pluginmodule.h
-+	$(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
- 
- #>+ 2
--mocs: cmodule.moc
-+mocs: pluginmodule.moc
- 
- #>+ 3
--pluginmodule.moc: $(srcdir)/pluginmodule.h
--	$(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
-+cmodule.moc: $(srcdir)/cmodule.h
-+	$(MOC) $(srcdir)/cmodule.h -o cmodule.moc
- 
- #>+ 2
--mocs: pluginmodule.moc
-+mocs: cmodule.moc
- 
- #>+ 3
- vequalizer.moc: $(srcdir)/noatun/vequalizer.h
-@@ -1199,18 +1202,18 @@
- mocs: playlist.moc
- 
- #>+ 3
--engine.moc: $(srcdir)/noatun/engine.h
--	$(MOC) $(srcdir)/noatun/engine.h -o engine.moc
-+plugin_deps.moc: $(srcdir)/plugin_deps.h
-+	$(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
- 
- #>+ 2
--mocs: engine.moc
-+mocs: plugin_deps.moc
- 
- #>+ 3
--plugin_deps.moc: $(srcdir)/plugin_deps.h
--	$(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
-+engine.moc: $(srcdir)/noatun/engine.h
-+	$(MOC) $(srcdir)/noatun/engine.h -o engine.moc
- 
- #>+ 2
--mocs: plugin_deps.moc
-+mocs: engine.moc
- 
- #>+ 3
- effectview.moc: $(srcdir)/effectview.h
-@@ -1244,7 +1247,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc scrollinglabel.moc
-+	-rm -f  downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc scrollinglabel.moc
- 
- #>+ 2
- KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am 
-@@ -1300,7 +1303,7 @@
- 
- 
- #>+ 11
--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
-@@ -207,6 +207,9 @@
+@@ -116,6 +116,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -207,6 +208,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22634,7 +49445,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -262,18 +266,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -309,14 +311,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -398,6 +404,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -412,8 +419,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -448,7 +457,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22643,7 +49512,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22657,7 +49526,15 @@
  mostlyclean-libtool:
 --- noatun/library/noatunarts/Makefile.in
 +++ noatun/library/noatunarts/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -162,6 +162,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -253,6 +254,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22667,7 +49544,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -308,18 +312,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -355,14 +357,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -444,6 +450,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -458,8 +465,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -511,7 +520,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -22676,7 +49611,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -549,9 +558,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22690,7 +49625,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/library/noatuntags/Makefile.in
 +++ noatun/library/noatuntags/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -146,6 +146,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -237,6 +238,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22700,7 +49643,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -292,18 +296,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -339,14 +341,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -428,6 +434,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -442,8 +449,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -479,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22709,7 +49710,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22746,7 +49747,15 @@
  am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
  #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
  #>+ 1
-@@ -254,6 +254,9 @@
+@@ -163,6 +163,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -254,6 +255,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22756,7 +49765,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,6 +493,7 @@
+@@ -309,18 +313,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -356,14 +358,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -445,6 +451,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -459,8 +466,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -490,6 +499,7 @@
  presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
  updatedir = $(kde_datadir)/kconf_update
  update_DATA = noatun.upd
@@ -22764,7 +49831,7 @@
  noatun20update_SOURCES = noatun20update.cpp
  noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  noatun20update_LDADD = $(LIB_QT)
-@@ -499,7 +503,7 @@
+@@ -499,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22773,7 +49840,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,34 +541,34 @@
+@@ -537,34 +547,34 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22821,7 +49888,7 @@
  	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
  	  echo " rm -f $$p $$f"; \
  	  rm -f $$p $$f ; \
-@@ -842,7 +846,7 @@
+@@ -842,7 +852,7 @@
  all-am: Makefile $(PROGRAMS) $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
@@ -22830,7 +49897,7 @@
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-recursive
-@@ -873,10 +877,10 @@
+@@ -873,10 +883,10 @@
  #>+ 1
  clean: kde-rpo-clean  clean-recursive
  
@@ -22843,7 +49910,7 @@
  	mostlyclean-am
  
  distclean: distclean-recursive
-@@ -895,11 +899,11 @@
+@@ -895,11 +905,11 @@
  
  info-am:
  
@@ -22859,7 +49926,7 @@
  
  install-exec-am:
  
-@@ -927,32 +931,33 @@
+@@ -927,32 +937,33 @@
  
  ps-am:
  
@@ -22905,35 +49972,17 @@
  
  
  messages:
-@@ -977,12 +982,12 @@
- 
- #>+ 22
- install-kde-icons:
-+	$(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
-@@ -991,9 +996,9 @@
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-noatun.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/noatun.png
- 
- uninstall-kde-icons:
-+	-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
-@@ -241,6 +241,9 @@
+@@ -150,6 +150,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22943,7 +49992,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -296,18 +300,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -343,14 +345,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -432,6 +438,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -446,8 +453,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -22952,7 +50059,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22966,7 +50073,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/dcopiface/Makefile.in
 +++ noatun/modules/dcopiface/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22976,7 +50091,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -491,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22985,7 +50158,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -529,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22999,7 +50172,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/excellent/Makefile.in
 +++ noatun/modules/excellent/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -154,6 +154,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -245,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23009,7 +50190,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -300,18 +304,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -347,14 +349,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -436,6 +442,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -450,8 +457,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -496,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23018,7 +50257,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23032,7 +50271,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/htmlexport/Makefile.in
 +++ noatun/modules/htmlexport/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -150,6 +150,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23042,7 +50289,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -296,18 +300,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -343,14 +345,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -432,6 +438,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -446,8 +453,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -488,7 +497,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23051,7 +50356,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +535,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23065,7 +50370,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/infrared/Makefile.in
 +++ noatun/modules/infrared/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23075,7 +50388,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -491,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23084,7 +50455,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -529,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23098,7 +50469,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kaiman/Makefile.in
 +++ noatun/modules/kaiman/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -169,6 +169,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -260,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23108,7 +50487,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -315,18 +319,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -362,14 +364,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -451,6 +457,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -465,8 +472,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23117,7 +50554,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +564,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23129,58 +50566,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -960,22 +963,22 @@
- mocs: userinterface.moc
- 
- #>+ 3
--style.moc: $(srcdir)/style.h
--	$(MOC) $(srcdir)/style.h -o style.moc
-+pref.moc: $(srcdir)/pref.h
-+	$(MOC) $(srcdir)/pref.h -o pref.moc
- 
- #>+ 2
--mocs: style.moc
-+mocs: pref.moc
- 
- #>+ 3
--pref.moc: $(srcdir)/pref.h
--	$(MOC) $(srcdir)/pref.h -o pref.moc
-+style.moc: $(srcdir)/style.h
-+	$(MOC) $(srcdir)/style.h -o style.moc
- 
- #>+ 2
--mocs: pref.moc
-+mocs: style.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  userinterface.moc style.moc pref.moc
-+	-rm -f  userinterface.moc pref.moc style.moc
- 
- #>+ 2
- KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am 
-@@ -1026,7 +1029,7 @@
- 
- 
- #>+ 11
--noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp  userinterface.moc pref.moc style.moc
-+noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp  userinterface.moc style.moc pref.moc
- 	@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; \
-@@ -1065,8 +1068,8 @@
- nmcheck: 
- userinterface.lo: userinterface.moc 
- nmcheck-am: nmcheck
--pref.lo: pref.moc 
- style.lo: style.moc 
-+pref.lo: pref.moc 
- userinterface.o: userinterface.moc 
- style.o: style.moc 
- pref.o: pref.moc 
 --- noatun/modules/kaiman/skins/car-preset/Makefile.in
 +++ noatun/modules/kaiman/skins/car-preset/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23190,7 +50586,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -446,7 +455,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23199,7 +50653,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -484,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23213,7 +50667,15 @@
  mostlyclean-libtool:
 --- noatun/modules/kaiman/skins/circle/Makefile.in
 +++ noatun/modules/kaiman/skins/circle/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23223,7 +50685,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -448,7 +457,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23232,7 +50752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23246,7 +50766,15 @@
  mostlyclean-libtool:
 --- noatun/modules/kaiman/skins/k9/Makefile.in
 +++ noatun/modules/kaiman/skins/k9/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23256,7 +50784,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -447,7 +456,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23265,7 +50851,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +494,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23277,18 +50863,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -646,7 +649,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png pos_item.jpg repeat.jpg newtext.png knine-nfont.jpg knine-normal2.png Makefile.am conf.png knine-normal2.jpg 
-+KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png repeat.jpg pos_item.jpg newtext.png knine-normal2.png knine-nfont.jpg Makefile.am conf.png knine-normal2.jpg 
- 
- #>+ 2
- docs-am:
 --- noatun/modules/kaiman/skins/Makefile.in
 +++ noatun/modules/kaiman/skins/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23298,7 +50883,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -445,7 +454,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23307,7 +50950,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +492,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23321,7 +50964,15 @@
  mostlyclean-libtool:
 --- noatun/modules/keyz/Makefile.in
 +++ noatun/modules/keyz/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -150,6 +150,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23331,7 +50982,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -296,18 +300,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -343,14 +345,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -432,6 +438,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -446,8 +453,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -486,7 +495,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23340,7 +51049,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -524,9 +533,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23354,7 +51063,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kjofol-skin/Makefile.in
 +++ noatun/modules/kjofol-skin/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -175,6 +175,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -266,6 +267,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23364,7 +51081,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -321,18 +325,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -368,14 +370,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -457,6 +463,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -471,8 +478,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23373,7 +51148,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23387,7 +51162,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23397,7 +51180,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -443,7 +452,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23406,7 +51247,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23420,7 +51261,15 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23430,7 +51279,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -446,7 +455,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23439,7 +51346,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -484,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23451,18 +51358,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -645,7 +648,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png sgpitchp.png sgplist2.png kjofol.rc sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am 
-+KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png kjofol.rc sgpitchp.png sgplist2.png sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am 
- 
- #>+ 2
- docs-am:
 --- noatun/modules/kjofol-skin/skins/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23472,7 +51378,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23481,7 +51445,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23495,7 +51459,15 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/phong/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/phong/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23505,7 +51477,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -443,7 +452,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23514,7 +51544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23528,7 +51558,15 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23538,7 +51576,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -443,7 +452,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23547,7 +51643,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23561,7 +51657,15 @@
  mostlyclean-libtool:
 --- noatun/modules/Makefile.in
 +++ noatun/modules/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23571,7 +51675,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -448,7 +457,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23580,7 +51742,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -486,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23594,7 +51756,15 @@
  mostlyclean-libtool:
 --- noatun/modules/marquis/Makefile.in
 +++ noatun/modules/marquis/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23604,7 +51774,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -491,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23613,7 +51841,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -529,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23627,7 +51855,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/metatag/Makefile.in
 +++ noatun/modules/metatag/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -154,6 +154,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -245,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23637,7 +51873,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -300,18 +304,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -347,14 +349,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -436,6 +442,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -450,8 +457,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -492,7 +501,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23646,7 +51940,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -530,9 +539,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23660,7 +51954,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/monoscope/Makefile.in
 +++ noatun/modules/monoscope/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -150,6 +150,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23670,7 +51972,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -296,18 +300,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -343,14 +345,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -432,6 +438,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -446,8 +453,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -488,7 +497,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23679,7 +52039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +535,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23693,7 +52053,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/net/Makefile.in
 +++ noatun/modules/net/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -150,6 +150,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -241,6 +242,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23703,7 +52071,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -296,18 +300,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -343,14 +345,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -432,6 +438,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -446,8 +453,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -486,7 +495,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23712,7 +52138,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -524,9 +533,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23726,7 +52152,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/noatunui/Makefile.in
 +++ noatun/modules/noatunui/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -154,6 +154,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -245,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23736,7 +52170,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -300,18 +304,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -347,14 +349,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -436,6 +442,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -450,8 +457,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -493,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23745,7 +52237,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23759,7 +52251,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/simple/Makefile.in
 +++ noatun/modules/simple/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23769,7 +52269,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -492,7 +501,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23778,7 +52336,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -530,9 +539,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23792,7 +52350,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/splitplaylist/Makefile.in
 +++ noatun/modules/splitplaylist/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -158,6 +158,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -249,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23802,7 +52368,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -304,18 +308,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -351,14 +353,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -440,6 +446,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -454,8 +461,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -496,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23811,7 +52435,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23825,7 +52449,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/systray/Makefile.in
 +++ noatun/modules/systray/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -155,6 +155,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -246,6 +247,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23835,7 +52467,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -301,18 +305,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -348,14 +350,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -437,6 +443,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -451,8 +458,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -496,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23844,7 +52534,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23856,18 +52546,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -853,7 +856,7 @@
- 	-rm -f  kitsystemtray.moc systray.moc cmodule.moc
- 
- #>+ 2
--KDE_DIST=yhconfig.kcfg yhconfig.kcfgc yhconfigwidget.ui systrayui.rc Makefile.in systray.plugin Makefile.am 
-+KDE_DIST=yhconfig.kcfg yhconfig.kcfgc systrayui.rc yhconfigwidget.ui Makefile.in systray.plugin Makefile.am 
- 
- #>+ 4
- clean-ui:
 --- noatun/modules/voiceprint/Makefile.in
 +++ noatun/modules/voiceprint/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -153,6 +153,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -244,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23877,7 +52566,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -299,18 +303,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -346,14 +348,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -435,6 +441,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -449,8 +456,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -489,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23886,7 +52633,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23900,7 +52647,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/winskin/Makefile.in
 +++ noatun/modules/winskin/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -174,6 +174,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -265,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23910,7 +52665,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -320,18 +324,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -367,14 +369,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -456,6 +462,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -470,8 +477,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -570,7 +579,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23919,7 +52732,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -608,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23931,81 +52744,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1105,18 +1108,18 @@
- mocs: waJumpSlider.moc
- 
- #>+ 3
--waIndicator.moc: $(srcdir)/waIndicator.h
--	$(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
-+guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
-+	$(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
- 
- #>+ 2
--mocs: waIndicator.moc
-+mocs: guiSpectrumAnalyser.moc
- 
- #>+ 3
--guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
--	$(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
-+waIndicator.moc: $(srcdir)/waIndicator.h
-+	$(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
- 
- #>+ 2
--mocs: guiSpectrumAnalyser.moc
-+mocs: waIndicator.moc
- 
- #>+ 3
- waButton.moc: $(srcdir)/waButton.h
-@@ -1161,18 +1164,18 @@
- mocs: waBalanceSlider.moc
- 
- #>+ 3
--waStatus.moc: $(srcdir)/waStatus.h
--	$(MOC) $(srcdir)/waStatus.h -o waStatus.moc
-+waTitleBar.moc: $(srcdir)/waTitleBar.h
-+	$(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
- 
- #>+ 2
--mocs: waStatus.moc
-+mocs: waTitleBar.moc
- 
- #>+ 3
--waTitleBar.moc: $(srcdir)/waTitleBar.h
--	$(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
-+waStatus.moc: $(srcdir)/waStatus.h
-+	$(MOC) $(srcdir)/waStatus.h -o waStatus.moc
- 
- #>+ 2
--mocs: waTitleBar.moc
-+mocs: waStatus.moc
- 
- #>+ 3
- waSkinManager.moc: $(srcdir)/waSkinManager.h
-@@ -1183,10 +1186,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
-+	-rm -f  waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
- 
- #>+ 2
--KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waLabel.h waTitleBar.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waShadeMapping.h waButton.h Makefile.am 
-+KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waTitleBar.h waLabel.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waButton.h waShadeMapping.h Makefile.am 
- 
- #>+ 4
- clean-idl:
-@@ -1239,7 +1242,7 @@
- 
- 
- #>+ 11
--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
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24015,7 +52764,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -440,7 +449,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24024,7 +52831,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -478,9 +487,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24038,7 +52845,15 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/mimetypes/Makefile.in
 +++ noatun/modules/winskin/mimetypes/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24048,7 +52863,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24057,7 +52930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24071,7 +52944,15 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/skins/Makefile.in
 +++ noatun/modules/winskin/skins/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -121,6 +121,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -212,6 +213,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24081,7 +52962,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,7 +449,7 @@
+@@ -267,18 +271,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -314,14 +316,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -403,6 +409,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -417,8 +424,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -446,7 +455,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24090,7 +53029,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -484,9 +487,9 @@
+@@ -484,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24104,7 +53043,15 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/skins/winamp/Makefile.in
 +++ noatun/modules/winskin/skins/winamp/Makefile.in
-@@ -204,6 +204,9 @@
+@@ -113,6 +113,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -204,6 +205,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24114,7 +53061,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -259,18 +263,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -306,14 +308,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -395,6 +401,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -409,8 +416,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24123,7 +53128,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24137,7 +53142,15 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/vis/Makefile.in
 +++ noatun/modules/winskin/vis/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -152,6 +152,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -243,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24147,7 +53160,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -298,18 +302,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -345,14 +347,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -434,6 +440,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -448,8 +455,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -500,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -24156,7 +53227,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -538,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24170,7 +53241,15 @@
  	@$(NORMAL_INSTALL)
 --- noatun/pics/Makefile.in
 +++ noatun/pics/Makefile.in
-@@ -194,6 +194,9 @@
+@@ -103,6 +103,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -194,6 +195,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24180,7 +53259,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -249,18 +253,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -296,14 +298,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -385,6 +391,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -399,8 +406,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -429,7 +438,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24189,7 +53326,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +476,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24201,153 +53338,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -612,89 +615,89 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr22-action-noatunlooprandom.png cr32-action-effect.png cr48-action-equalizer.png cr22-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am 
-+KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr32-action-effect.png cr22-action-noatunlooprandom.png cr22-action-equalizer.png cr48-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am 
- 
- #>+ 2
- docs-am:
- 
- #>+ 78
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopsong.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
-+	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
- 	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
--	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
--	$(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
-+	$(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
-+	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopnone.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
--	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunlooprandom.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopsong.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
-+	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopnone.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
-+	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
- 	$(INSTALL_DATA) $(srcdir)/cr128-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunfforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunfback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
--	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions
--	$(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
--	$(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
--	$(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
- 	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
--	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
-+	-rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
- 
- #>+ 15
- force-reedit:
 --- oggvorbis_artsplugin/Makefile.in
 +++ oggvorbis_artsplugin/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -154,6 +154,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -245,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24357,7 +53358,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -300,18 +304,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -347,14 +349,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -436,6 +442,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -450,8 +457,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -493,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -24366,7 +53425,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24380,7 +53439,15 @@
  	@$(NORMAL_INSTALL)
 --- xine_artsplugin/Makefile.in
 +++ xine_artsplugin/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -176,6 +176,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -267,6 +268,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24390,7 +53457,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -322,18 +326,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -369,14 +371,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -458,6 +464,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -472,8 +479,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -517,7 +526,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -24399,7 +53524,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +564,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24413,7 +53538,15 @@
  	@$(NORMAL_INSTALL)
 --- xine_artsplugin/tools/Makefile.in
 +++ xine_artsplugin/tools/Makefile.in
-@@ -210,6 +210,9 @@
+@@ -119,6 +119,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -210,6 +211,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24423,7 +53556,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -265,18 +269,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -312,14 +314,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -401,6 +407,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -415,8 +422,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -444,7 +453,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24432,7 +53623,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24446,7 +53637,15 @@
  mostlyclean-libtool:
 --- xine_artsplugin/tools/thumbnail/Makefile.in
 +++ xine_artsplugin/tools/thumbnail/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -155,6 +155,7 @@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+@@ -246,6 +247,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24456,7 +53655,65 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -301,18 +305,16 @@
+ XINE_CFLAGS = @XINE_CFLAGS@
+ XINE_CONFIG = @XINE_CONFIG@
+ XINE_LIBS = @XINE_LIBS@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ akode_artsplugin_SUBDIR_included_FALSE = @akode_artsplugin_SUBDIR_included_FALSE@
+ akode_artsplugin_SUBDIR_included_TRUE = @akode_artsplugin_SUBDIR_included_TRUE@
+ akode_includes = @akode_includes@
+@@ -348,14 +350,18 @@
+ compile_ogg_export_FALSE = @compile_ogg_export_FALSE@
+ compile_ogg_export_TRUE = @compile_ogg_export_TRUE@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_akode_ffmpeg_FALSE = @include_akode_ffmpeg_FALSE@
+@@ -437,6 +443,7 @@
+ libwm_with_cdda_TRUE = @libwm_with_cdda_TRUE@
+ link_lib_MB_FALSE = @link_lib_MB_FALSE@
+ link_lib_MB_TRUE = @link_lib_MB_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -451,8 +458,10 @@
+ oggvorbis_artsplugin_SUBDIR_included_FALSE = @oggvorbis_artsplugin_SUBDIR_included_FALSE@
+ oggvorbis_artsplugin_SUBDIR_included_TRUE = @oggvorbis_artsplugin_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -492,7 +501,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24465,7 +53722,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -530,9 +539,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