rev 4604 - trunk/packages/kdeaccessibility/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Thu Oct 5 01:00:44 UTC 2006


Author: chrsmrtn
Date: 2006-10-05 01:00:41 +0000 (Thu, 05 Oct 2006)
New Revision: 4604

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


Modified: trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff	2006-10-05 00:57:12 UTC (rev 4603)
+++ trunk/packages/kdeaccessibility/debian/patches/98_buildprep.diff	2006-10-05 01:00:41 UTC (rev 4604)
@@ -28,7 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5973,30 +5961,15 @@
+@@ -5970,30 +5958,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6029,7 @@
+@@ -6053,7 +6026,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -73,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6103,7 +6076,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6123,7 +6096,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -91,7 +91,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6143,6 +6116,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -99,7 +99,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6139,17 @@
+@@ -6162,15 +6136,17 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -119,7 +119,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6214,11 +6190,56 @@
+@@ -6211,11 +6187,56 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -176,7 +176,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6291,15 +6312,15 @@
+@@ -6288,15 +6309,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -195,7 +195,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6468,14 +6489,13 @@
+@@ -6465,14 +6486,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6484,7 +6504,6 @@
        esac
        ;;
      *64-bit*)
@@ -220,7 +220,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6518,6 +6537,22 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -243,7 +243,7 @@
  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
  [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6587,7 @@
+@@ -6549,7 +6584,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -252,7 +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)
-@@ -6562,8 +6597,10 @@
+@@ -6559,8 +6594,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
@@ -265,7 +265,7 @@
         $2=yes
       fi
     fi
-@@ -6589,11 +6626,16 @@
+@@ -6586,11 +6623,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +283,7 @@
       else
         $2=yes
       fi
-@@ -6617,7 +6659,7 @@
+@@ -6614,7 +6656,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -292,7 +292,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6643,20 +6685,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.
-@@ -6676,7 +6768,7 @@
+@@ -6673,7 +6765,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
-@@ -6684,7 +6776,7 @@
+@@ -6681,7 +6773,7 @@
  
  # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
  #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +387,7 @@
  AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6842,19 @@
+@@ -6747,17 +6839,19 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -409,7 +409,7 @@
      esac
    else :
      # compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6769,7 +6863,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
-@@ -6809,7 +6903,7 @@
+@@ -6806,7 +6900,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -427,7 +427,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6840,7 +6934,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -436,7 +436,7 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6950,7 @@
+@@ -6853,7 +6947,7 @@
      ])
  
      if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +445,7 @@
        AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
      	  lt_cv_dlopen_self_static, [dnl
  	  _LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +6992,13 @@
+@@ -6895,20 +6989,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -467,7 +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)
-@@ -6923,13 +7010,18 @@
+@@ -6920,13 +7007,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -490,7 +490,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6985,8 +7077,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +501,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7043,7 +7135,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -510,7 +510,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7059,7 +7151,7 @@
+@@ -7056,7 +7148,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -519,7 +519,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7066,7 +7158,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +541,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7134,7 +7239,7 @@
+@@ -7131,7 +7236,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
    ;;
  
  beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7140,7 +7245,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}'
-@@ -7159,7 +7264,7 @@
+@@ -7156,7 +7261,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -568,7 +568,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7171,7 +7276,8 @@
+@@ -7168,7 +7273,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7198,7 +7304,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
        ;;
      esac
      ;;
-@@ -7224,7 +7330,7 @@
+@@ -7221,7 +7327,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +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"`
-@@ -7247,20 +7353,17 @@
+@@ -7244,20 +7350,17 @@
    dynamic_linker=no
    ;;
  
@@ -628,7 +628,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7278,14 +7381,19 @@
+@@ -7275,14 +7378,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -650,7 +650,7 @@
    esac
    ;;
  
-@@ -7305,9 +7413,9 @@
+@@ -7302,9 +7410,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
-@@ -7322,7 +7430,7 @@
+@@ -7319,7 +7427,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
-@@ -7333,7 +7441,7 @@
+@@ -7330,7 +7438,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
-@@ -7345,6 +7453,18 @@
+@@ -7342,6 +7450,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -699,7 +699,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7508,26 @@
+@@ -7385,29 +7505,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -736,7 +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,
-@@ -7420,6 +7537,18 @@
+@@ -7417,6 +7534,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -755,7 +755,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7429,7 +7558,7 @@
+@@ -7426,7 +7555,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -764,7 +764,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7457,8 +7586,13 @@
+@@ -7454,8 +7583,13 @@
  
  openbsd*)
    version_type=sunos
@@ -779,7 +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
-@@ -7478,7 +7612,7 @@
+@@ -7475,7 +7609,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'
-@@ -7496,13 +7630,6 @@
+@@ -7493,13 +7627,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -802,7 +802,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -7528,7 +7655,7 @@
+@@ -7525,7 +7652,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'
-@@ -7561,6 +7688,29 @@
+@@ -7558,6 +7685,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}'
-@@ -7574,6 +7724,11 @@
+@@ -7571,6 +7721,11 @@
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
  ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
  
-@@ -7598,6 +7753,9 @@
+@@ -7595,6 +7750,9 @@
        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
      fi
    fi
@@ -863,7 +863,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -7624,7 +7782,9 @@
+@@ -7621,7 +7779,9 @@
  
        case $tagname in
        CXX)
@@ -874,7 +874,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7686,7 +7846,7 @@
+@@ -7683,7 +7843,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
-@@ -7724,7 +7884,7 @@
+@@ -7721,7 +7881,7 @@
  
  # AC_DISABLE_SHARED
  # -----------------
@@ -892,7 +892,7 @@
  AC_DEFUN([AC_DISABLE_SHARED],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_ENABLE_SHARED(no)
-@@ -7860,7 +8020,7 @@
+@@ -7857,7 +8017,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -901,7 +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
-@@ -7970,7 +8130,7 @@
+@@ -7967,7 +8127,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -910,7 +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'*)
-@@ -8002,7 +8162,7 @@
+@@ -7999,7 +8159,7 @@
  AC_DEFUN([AC_PROG_LD_GNU],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -919,7 +919,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8189,15 @@
+@@ -8026,6 +8186,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8062,44 +8231,36 @@
+@@ -8059,44 +8228,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.*`
        ;;
-@@ -8115,7 +8276,7 @@
+@@ -8112,7 +8273,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
-@@ -8131,43 +8292,27 @@
+@@ -8128,43 +8289,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
-@@ -8186,32 +8331,22 @@
+@@ -8183,32 +8328,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]]'
-@@ -8232,10 +8367,13 @@
+@@ -8229,10 +8364,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1108,7 +1108,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -8255,36 +8393,43 @@
+@@ -8252,36 +8390,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -1176,7 +1176,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi])
  NM="$lt_cv_path_NM"
-@@ -8316,13 +8461,13 @@
+@@ -8313,13 +8458,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8341,13 +8486,13 @@
+@@ -8338,13 +8483,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +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
-@@ -8385,10 +8530,21 @@
+@@ -8382,10 +8527,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8428,7 +8584,7 @@
+@@ -8425,7 +8581,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])
-@@ -8461,36 +8617,9 @@
+@@ -8458,36 +8614,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1290,7 +1290,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8633,9 @@
+@@ -8501,9 +8630,9 @@
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
  AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1302,7 @@
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
  
-@@ -8515,7 +8644,7 @@
+@@ -8512,7 +8641,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1311,7 +1311,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8524,48 +8653,11 @@
+@@ -8521,48 +8650,11 @@
    fi
    ;;
  
@@ -1362,7 +1362,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8590,7 +8682,7 @@
+@@ -8587,7 +8679,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1371,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8694,7 @@
+@@ -8599,6 +8691,7 @@
  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
  _LT_AC_TAGVAR(module_cmds, $1)=
  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8712,7 @@
+@@ -8616,7 +8709,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1388,7 +1388,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8629,11 +8722,15 @@
+@@ -8626,11 +8719,15 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -1405,7 +1405,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8644,18 +8741,18 @@
+@@ -8641,18 +8738,18 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -1427,7 +1427,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8673,8 +8770,8 @@
+@@ -8670,8 +8767,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -1438,7 +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'
-@@ -8700,7 +8797,7 @@
+@@ -8697,7 +8794,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -1447,7 +1447,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8827,23 @@
+@@ -8727,8 +8824,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1473,7 +1473,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8748,7 +8860,7 @@
+@@ -8745,7 +8857,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1482,7 +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`
-@@ -8767,8 +8879,12 @@
+@@ -8764,8 +8876,12 @@
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
@@ -1495,7 +1495,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8777,15 +8893,16 @@
+@@ -8774,15 +8890,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +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.
-@@ -8794,13 +8911,12 @@
+@@ -8791,13 +8908,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1532,7 +1532,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,22 +8925,32 @@
+@@ -8806,22 +8922,32 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1576,7 @@
      esac
      ;;
  
-@@ -8832,12 +8958,12 @@
+@@ -8829,12 +8955,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1591,7 +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
-@@ -8846,70 +8972,81 @@
+@@ -8843,70 +8969,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
-@@ -8920,14 +9057,14 @@
+@@ -8917,14 +9054,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
-@@ -8944,12 +9081,12 @@
+@@ -8941,12 +9078,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.
-@@ -8958,11 +9095,11 @@
+@@ -8955,11 +9092,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -1772,7 +1772,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9109,23 @@
+@@ -8969,34 +9106,23 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1814,7 +1814,7 @@
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9009,17 +9135,20 @@
+@@ -9006,17 +9132,20 @@
      esac
  
      case $cc_basename in
@@ -1841,7 +1841,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9164,15 @@
+@@ -9032,12 +9161,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -9051,11 +9183,25 @@
+@@ -9048,11 +9180,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
-@@ -9066,9 +9212,9 @@
+@@ -9063,9 +9209,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
-@@ -9077,16 +9223,16 @@
+@@ -9074,16 +9220,16 @@
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
@@ -1922,7 +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.
-@@ -9104,20 +9250,44 @@
+@@ -9101,20 +9247,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1973,7 +1973,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9315,7 @@
+@@ -9142,7 +9312,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1982,7 +1982,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9155,7 +9325,7 @@
+@@ -9152,7 +9322,7 @@
  	;;
      esac
      ;;
@@ -1991,7 +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=
-@@ -9166,15 +9336,31 @@
+@@ -9163,15 +9333,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -2025,7 +2025,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9370,14 @@
+@@ -9181,14 +9367,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -2043,7 +2043,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9395,7 @@
+@@ -9206,7 +9392,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9414,13 @@
+@@ -9225,13 +9411,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -2068,7 +2068,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9429,17 @@
+@@ -9240,17 +9426,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -2090,7 +2090,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9458,7 @@
+@@ -9269,7 +9455,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9479,14 @@
+@@ -9290,27 +9476,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -2129,7 +2129,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9499,33 @@
+@@ -9323,36 +9496,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -2178,7 +2178,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9363,9 +9533,9 @@
+@@ -9360,9 +9530,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -2190,7 +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'
-@@ -9375,9 +9545,9 @@
+@@ -9372,9 +9542,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2202,7 +2202,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9556,9 @@
+@@ -9383,9 +9553,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -2214,7 +2214,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9571,63 @@
+@@ -9398,12 +9568,63 @@
  	;;
      esac
      ;;
@@ -2280,7 +2280,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9664,6 @@
+@@ -9440,8 +9661,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2289,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9462,7 +9681,7 @@
+@@ -9459,7 +9678,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2298,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -9516,7 +9735,7 @@
+@@ -9513,7 +9732,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -2307,7 +2307,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9553,7 +9772,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
-@@ -9592,13 +9811,37 @@
+@@ -9589,13 +9808,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'.
-@@ -9642,12 +9885,16 @@
+@@ -9639,12 +9882,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2373,7 +2373,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9904,7 @@
+@@ -9654,7 +9901,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2382,7 +2382,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9665,8 +9912,10 @@
+@@ -9662,8 +9909,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2395,7 +2395,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9925,6 @@
+@@ -9673,8 +9922,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2404,7 +2404,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -9687,8 +9934,6 @@
+@@ -9684,8 +9931,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2413,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9717,20 +9962,27 @@
+@@ -9714,20 +9959,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2442,7 +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
-@@ -9742,8 +9994,6 @@
+@@ -9739,8 +9991,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2451,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9753,7 +10003,7 @@
+@@ -9750,7 +10000,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'.
-@@ -9777,11 +10027,16 @@
+@@ -9774,11 +10024,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2477,7 +2477,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10062,12 @@
+@@ -9804,11 +10059,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2492,7 +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 \
-@@ -9861,7 +10117,7 @@
+@@ -9858,7 +10114,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +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 | \
-@@ -9927,11 +10183,11 @@
+@@ -9924,11 +10180,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2515,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9962,6 +10218,12 @@
+@@ -9959,6 +10215,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2528,7 +2528,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9973,6 +10235,9 @@
+@@ -9970,6 +10232,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2538,7 +2538,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -9992,7 +10257,7 @@
+@@ -9989,7 +10254,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2547,7 +2547,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10288,7 @@
+@@ -10020,7 +10285,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10038,7 +10303,7 @@
+@@ -10035,7 +10300,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2565,7 +2565,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10267,7 +10532,10 @@
+@@ -10264,7 +10529,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -2577,7 +2577,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10309,9 +10577,6 @@
+@@ -10306,9 +10574,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2587,7 +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'"
  
-@@ -10333,14 +10598,30 @@
+@@ -10330,14 +10595,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -2620,7 +2620,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10358,14 +10639,17 @@
+@@ -10355,14 +10636,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10521,6 +10805,10 @@
+@@ -10518,6 +10802,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2651,7 +2651,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10817,7 @@
+@@ -10526,7 +10814,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2660,7 +2660,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10554,18 +10842,28 @@
+@@ -10551,18 +10839,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2692,7 +2692,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10573,22 +10871,22 @@
+@@ -10570,22 +10868,22 @@
  	    ;;
  	esac
  	;;
@@ -2721,7 +2721,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10601,9 +10899,13 @@
+@@ -10598,9 +10896,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.
-@@ -10612,20 +10914,26 @@
+@@ -10609,20 +10911,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.
-@@ -10642,25 +10950,25 @@
+@@ -10639,25 +10947,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
-@@ -10674,24 +10982,15 @@
+@@ -10671,24 +10979,15 @@
  	;;
        psos*)
  	;;
@@ -2826,7 +2826,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10701,12 +11000,12 @@
+@@ -10698,12 +10997,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2841,7 +2841,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10716,7 +11015,7 @@
+@@ -10713,7 +11012,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2850,7 +2850,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10724,7 +11023,14 @@
+@@ -10721,7 +11020,14 @@
  	    ;;
  	esac
  	;;
@@ -2866,7 +2866,7 @@
  	;;
        vxworks*)
  	;;
-@@ -10771,6 +11077,11 @@
+@@ -10768,6 +11074,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.
-@@ -10787,7 +11098,7 @@
+@@ -10784,7 +11095,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2887,7 +2887,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10813,6 +11124,16 @@
+@@ -10810,6 +11121,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2904,7 +2904,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11145,7 @@
+@@ -10821,7 +11142,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2913,7 +2913,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10847,13 +11168,20 @@
+@@ -10844,13 +11165,20 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2936,7 +2936,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10868,15 +11196,15 @@
+@@ -10865,15 +11193,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2958,7 +2958,7 @@
        ;;
  
      sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10882,7 +11210,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'
-@@ -10898,6 +11226,17 @@
+@@ -10895,6 +11223,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'
-@@ -10925,7 +11264,7 @@
+@@ -10922,7 +11261,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2994,7 +2994,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11273,16 @@
+@@ -10931,6 +11270,16 @@
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -3011,7 +3011,7 @@
  ])
  
  
-@@ -10958,7 +11307,10 @@
+@@ -10955,7 +11304,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'
-@@ -10984,7 +11336,7 @@
+@@ -10981,7 +11333,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +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*
-@@ -11001,7 +11353,8 @@
+@@ -10998,7 +11350,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11364,10 @@
+@@ -11008,6 +11361,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -3053,7 +3053,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -11021,6 +11378,27 @@
+@@ -11018,6 +11375,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -3081,7 +3081,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11058,7 +11436,7 @@
+@@ -11055,7 +11433,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -3090,7 +3090,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11068,13 +11446,13 @@
+@@ -11065,13 +11443,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3107,7 +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
-@@ -11083,23 +11461,70 @@
+@@ -11080,23 +11458,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
-@@ -11113,13 +11538,40 @@
+@@ -11110,13 +11535,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=
-@@ -11129,24 +11581,19 @@
+@@ -11126,24 +11578,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)
-@@ -11158,7 +11605,7 @@
+@@ -11155,7 +11602,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3268,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11627,21 @@
+@@ -11177,9 +11624,21 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -3292,7 +3292,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11199,7 +11658,7 @@
+@@ -11196,7 +11655,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3301,7 +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`
-@@ -11218,8 +11677,12 @@
+@@ -11215,8 +11674,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3314,7 +3314,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11227,30 +11690,30 @@
+@@ -11224,30 +11687,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3356,7 +3356,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11722,11 @@
+@@ -11256,13 +11719,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3373,7 @@
  	fi
        fi
        ;;
-@@ -11278,7 +11739,7 @@
+@@ -11275,7 +11736,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3382,7 +3382,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11288,69 +11749,69 @@
+@@ -11285,69 +11746,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
        ;;
  
      dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11380,8 +11841,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
-@@ -11392,7 +11853,7 @@
+@@ -11389,7 +11850,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
-@@ -11406,47 +11867,62 @@
+@@ -11403,47 +11864,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'
  
-@@ -11460,7 +11936,7 @@
+@@ -11457,7 +11933,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'
-@@ -11470,7 +11946,7 @@
+@@ -11467,7 +11943,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
-@@ -11493,7 +11969,8 @@
+@@ -11490,7 +11966,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3633,7 +3633,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11503,7 +11980,7 @@
+@@ -11500,7 +11977,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -3642,7 +3642,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11514,14 +11991,14 @@
+@@ -11511,14 +11988,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3659,7 +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'
-@@ -11533,13 +12010,13 @@
+@@ -11530,13 +12007,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3675,7 +3675,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12024,15 @@
+@@ -11544,21 +12021,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3701,7 +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'
-@@ -11570,8 +12041,18 @@
+@@ -11567,8 +12038,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3722,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11580,7 +12061,7 @@
+@@ -11577,7 +12058,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -3731,7 +3731,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11628,36 +12109,45 @@
+@@ -11625,36 +12106,45 @@
        fi
        ;;
  
@@ -3798,7 +3798,7 @@
        ;;
  
      uts4*)
-@@ -11675,11 +12165,6 @@
+@@ -11672,11 +12162,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3810,7 +3810,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -11700,13 +12185,14 @@
+@@ -11697,13 +12182,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -11834,7 +12320,7 @@
+@@ -11831,7 +12317,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3910,7 +3910,7 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.60a.
  #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4600,19 +4600,53 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -455,17 +745,337 @@
+@@ -430,42 +720,362 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
  #endif
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef 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
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
@@ -5142,9 +5176,15 @@
  
 -# Be sure to have absolute paths.
 -for ac_var in exec_prefix prefix
--do
++# 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`
--  case $ac_val in
++  eval ac_val=\$$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; }; };;
@@ -5154,15 +5194,9 @@
 -# 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
+-do
 -  eval ac_val=$`echo $ac_var`
-+  eval ac_val=\$$ac_var
-   case $ac_val in
+-  case $ac_val in
 -    [\\/$]* | ?:[\\/]* ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 -   { (exit 1); exit 1; }; };;
@@ -5547,7 +5581,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5566,7 +5600,7 @@
  
  It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.60a.  Invocation command line was
  
    $ $0 $@
  
@@ -6454,9 +6488,9 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2274,16 +2981,16 @@
+@@ -2273,16 +2980,16 @@
+   fi
    kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-   kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
  
 -  echo "$as_me:$LINENO: checking where to install" >&5
 -echo $ECHO_N "checking where to install... $ECHO_C" >&6
@@ -6477,7 +6511,7 @@
    fi
  
    # And delete superfluous '/' to make compares easier
-@@ -2296,13 +3003,13 @@
+@@ -2295,13 +3002,13 @@
  
  
  
@@ -6495,7 +6529,7 @@
  
  
    val=
-@@ -2319,11 +3026,11 @@
+@@ -2318,11 +3025,11 @@
  
  
  
@@ -6509,7 +6543,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2333,8 +3040,8 @@
+@@ -2332,8 +3039,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -6520,7 +6554,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2361,15 +3068,15 @@
+@@ -2360,15 +3067,15 @@
  fi
  
  
@@ -6541,7 +6575,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2389,10 +3096,9 @@
+@@ -2388,10 +3095,9 @@
  
  
  
@@ -6554,7 +6588,7 @@
      case $enableval in
        yes)
          kde_use_debug_code="yes"
-@@ -2412,18 +3118,18 @@
+@@ -2411,18 +3117,18 @@
    kde_use_debug_code="no"
        kde_use_debug_define=no
  
@@ -6580,7 +6614,7 @@
      if test $enableval = "no"; then
           kde_use_strict_options="no"
         else
-@@ -2432,12 +3138,12 @@
+@@ -2431,12 +3137,12 @@
  
  else
    kde_use_strict_options="no"
@@ -6597,7 +6631,7 @@
      if test $enableval = "no"; then
           kde_use_warnings="no"
         else
-@@ -2446,20 +3152,21 @@
+@@ -2445,20 +3151,21 @@
  
  else
    kde_use_warnings="yes"
@@ -6624,7 +6658,7 @@
  
      CFLAGS=" $CFLAGS"
  
-@@ -2471,8 +3178,8 @@
+@@ -2470,8 +3177,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
@@ -6635,7 +6669,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2485,32 +3192,34 @@
+@@ -2484,32 +3191,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6677,7 +6711,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2523,36 +3232,51 @@
+@@ -2522,36 +3231,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6739,7 +6773,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2565,74 +3289,34 @@
+@@ -2564,74 +3288,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6823,7 +6857,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2646,7 +3330,7 @@
+@@ -2645,7 +3329,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6832,7 +6866,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2657,6 +3341,7 @@
+@@ -2656,6 +3340,7 @@
    fi
  done
  done
@@ -6840,7 +6874,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2674,22 +3359,23 @@
+@@ -2673,22 +3358,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -6871,7 +6905,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2702,36 +3388,38 @@
+@@ -2701,36 +3387,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6918,7 +6952,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2744,29 +3432,45 @@
+@@ -2743,29 +3431,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6970,7 +7004,7 @@
  fi
  
  fi
-@@ -2779,21 +3483,35 @@
+@@ -2778,21 +3482,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -7014,7 +7048,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2818,46 +3536,70 @@
+@@ -2817,47 +3535,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -7068,7 +7102,7 @@
 +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
 +# so that the user can short-circuit this test for compilers unknown to
 +# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
  do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7105,16 +7139,21 @@
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
 +
  else
++  ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2870,19 +3612,23 @@
+ 
+@@ -2869,19 +3617,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_file" >&5
 -echo "${ECHO_T}$ac_file" >&6
-+{ 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
 +# Check that the compiler produces executables we can run.  If not, either
@@ -7138,7 +7177,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2901,22 +3647,27 @@
+@@ -2900,22 +3650,27 @@
      fi
    fi
  fi
@@ -7178,7 +7217,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2927,9 +3678,8 @@
+@@ -2926,9 +3681,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7189,7 +7228,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -2943,14 +3693,14 @@
+@@ -2942,14 +3696,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -7208,7 +7247,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2970,14 +3720,20 @@
+@@ -2969,14 +3723,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -7233,7 +7272,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2995,12 +3751,12 @@
+@@ -2994,12 +3754,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -7250,7 +7289,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3023,24 +3779,36 @@
+@@ -3022,24 +3782,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7295,7 +7334,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3049,24 +3817,28 @@
+@@ -3048,24 +3820,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7332,7 +7371,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3082,24 +3854,36 @@
+@@ -3081,24 +3857,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7377,7 +7416,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3108,285 +3892,278 @@
+@@ -3107,285 +3895,278 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7840,7 +7879,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3395,8 +4172,8 @@
+@@ -3394,8 +4175,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -7851,7 +7890,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3485,8 +4262,8 @@
+@@ -3484,8 +4265,8 @@
  fi
  
  fi
@@ -7862,7 +7901,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3508,8 +4285,8 @@
+@@ -3507,8 +4288,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
@@ -7873,7 +7912,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3543,8 +4320,13 @@
+@@ -3542,8 +4323,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7889,7 +7928,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3569,9 +4351,10 @@
+@@ -3568,9 +4354,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7901,7 +7940,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3581,8 +4364,13 @@
+@@ -3580,8 +4367,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7917,7 +7956,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3609,6 +4397,7 @@
+@@ -3608,6 +4400,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7925,7 +7964,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3626,8 +4415,8 @@
+@@ -3625,8 +4418,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -7936,7 +7975,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3650,8 +4439,13 @@
+@@ -3649,8 +4442,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7952,7 +7991,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3676,9 +4470,10 @@
+@@ -3675,9 +4473,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7964,7 +8003,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3688,8 +4483,13 @@
+@@ -3687,8 +4486,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7980,7 +8019,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3716,6 +4516,7 @@
+@@ -3715,6 +4519,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7988,7 +8027,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3766,18 +4567,22 @@
+@@ -3765,18 +4570,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -8016,7 +8055,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3790,36 +4595,38 @@
+@@ -3789,36 +4598,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8063,7 +8102,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3832,55 +4639,85 @@
+@@ -3831,55 +4642,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8167,7 +8206,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3903,24 +4740,36 @@
+@@ -3902,24 +4743,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8212,7 +8251,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3929,24 +4778,28 @@
+@@ -3928,24 +4781,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8249,7 +8288,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3962,24 +4815,36 @@
+@@ -3961,24 +4818,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8294,7 +8333,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3988,70 +4853,53 @@
+@@ -3987,70 +4856,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8389,7 +8428,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4060,61 +4908,91 @@
+@@ -4059,61 +4911,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8475,12 +8514,12 @@
 -  echo '#endif'             >>confdefs.h
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
++rm -f core 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
@@ -8503,7 +8542,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4123,8 +5001,8 @@
+@@ -4122,8 +5004,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -8514,7 +8553,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4213,8 +5091,8 @@
+@@ -4212,8 +5094,8 @@
  fi
  
  fi
@@ -8525,7 +8564,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4232,8 +5110,8 @@
+@@ -4231,8 +5113,8 @@
  
  
  
@@ -8536,7 +8575,7 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4258,24 +5136,36 @@
+@@ -4257,24 +5139,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8581,7 +8620,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4284,13 +5174,14 @@
+@@ -4283,13 +5177,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8600,7 +8639,7 @@
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4332,17 +5223,16 @@
+@@ -4331,17 +5226,16 @@
          fi
        fi
  
@@ -8622,7 +8661,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4370,24 +5260,36 @@
+@@ -4369,24 +5263,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8667,7 +8706,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4396,8 +5298,10 @@
+@@ -4395,8 +5301,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8675,11 +8714,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4410,29 +5314,28 @@
+@@ -4409,29 +5317,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8717,7 +8756,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4459,24 +5362,36 @@
+@@ -4458,24 +5365,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8762,7 +8801,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4485,8 +5400,10 @@
+@@ -4484,8 +5403,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8770,11 +8809,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4499,13 +5416,13 @@
+@@ -4498,13 +5419,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8792,7 +8831,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4526,16 +5443,15 @@
+@@ -4525,16 +5446,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -8813,7 +8852,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4562,24 +5478,36 @@
+@@ -4561,24 +5481,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8858,7 +8897,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4588,8 +5516,10 @@
+@@ -4587,8 +5519,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8866,11 +8905,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4602,16 +5532,16 @@
+@@ -4601,16 +5535,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8891,7 +8930,7 @@
   :
  
  fi
-@@ -4626,16 +5556,15 @@
+@@ -4625,16 +5559,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"
  
@@ -8912,7 +8951,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4662,24 +5591,36 @@
+@@ -4661,24 +5594,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8957,7 +8996,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4688,8 +5629,10 @@
+@@ -4687,8 +5632,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8965,11 +9004,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4702,27 +5645,26 @@
+@@ -4701,27 +5648,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9004,7 +9043,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4747,24 +5689,36 @@
+@@ -4746,24 +5692,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9049,7 +9088,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4773,8 +5727,10 @@
+@@ -4772,8 +5730,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9057,11 +9096,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
    ac_ext=c
-@@ -4787,13 +5743,13 @@
+@@ -4786,13 +5746,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9079,7 +9118,7 @@
   :
  
  fi
-@@ -4801,16 +5757,15 @@
+@@ -4800,16 +5760,15 @@
            ;;
          esac
  
@@ -9100,7 +9139,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4837,24 +5792,36 @@
+@@ -4836,24 +5795,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9145,7 +9184,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4863,8 +5830,10 @@
+@@ -4862,8 +5833,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9153,11 +9192,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4877,28 +5846,27 @@
+@@ -4876,28 +5849,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9194,7 +9233,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4925,24 +5893,36 @@
+@@ -4924,24 +5896,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9239,7 +9278,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4951,8 +5931,10 @@
+@@ -4950,8 +5934,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9247,11 +9286,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4965,28 +5947,27 @@
+@@ -4964,28 +5950,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9288,7 +9327,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5013,24 +5994,36 @@
+@@ -5012,24 +5997,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9333,7 +9372,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5039,8 +6032,10 @@
+@@ -5038,8 +6035,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9341,11 +9380,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5053,13 +6048,13 @@
+@@ -5052,13 +6051,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9363,7 +9402,7 @@
   :
  
  fi
-@@ -5071,13 +6066,13 @@
+@@ -5070,13 +6069,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -9381,7 +9420,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5085,16 +6080,15 @@
+@@ -5084,16 +6083,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -9402,7 +9441,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5121,24 +6115,36 @@
+@@ -5120,24 +6118,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9447,7 +9486,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5147,8 +6153,10 @@
+@@ -5146,8 +6156,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9455,11 +9494,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5161,13 +6169,13 @@
+@@ -5160,13 +6172,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9477,7 +9516,7 @@
   :
  
  fi
-@@ -5179,16 +6187,15 @@
+@@ -5178,16 +6190,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -9498,7 +9537,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5215,24 +6222,36 @@
+@@ -5214,24 +6225,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9543,7 +9582,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5241,8 +6260,10 @@
+@@ -5240,8 +6263,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9551,11 +9590,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5255,28 +6276,27 @@
+@@ -5254,28 +6279,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9592,7 +9631,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5303,24 +6323,36 @@
+@@ -5302,24 +6326,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9637,7 +9676,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5329,8 +6361,10 @@
+@@ -5328,8 +6364,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9645,11 +9684,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5343,28 +6377,27 @@
+@@ -5342,28 +6380,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9686,7 +9725,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5391,24 +6424,36 @@
+@@ -5390,24 +6427,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9731,7 +9770,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5417,8 +6462,10 @@
+@@ -5416,8 +6465,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9739,11 +9778,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5431,28 +6478,27 @@
+@@ -5430,28 +6481,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9780,7 +9819,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5479,24 +6525,36 @@
+@@ -5478,24 +6528,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9825,7 +9864,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5505,8 +6563,10 @@
+@@ -5504,8 +6566,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9833,11 +9872,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5519,13 +6579,13 @@
+@@ -5518,13 +6582,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9855,7 +9894,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5533,37 +6593,37 @@
+@@ -5532,37 +6596,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -9907,7 +9946,7 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5595,24 +6655,36 @@
+@@ -5594,24 +6658,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9952,7 +9991,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5621,18 +6693,19 @@
+@@ -5620,18 +6696,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9962,7 +10001,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
      CFLAGS="$ac_cflags_save"
@@ -9976,7 +10015,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5652,16 +6725,15 @@
+@@ -5651,16 +6728,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -9997,7 +10036,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5688,24 +6760,36 @@
+@@ -5687,24 +6763,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10042,7 +10081,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5714,8 +6798,10 @@
+@@ -5713,8 +6801,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10050,11 +10089,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5728,29 +6814,28 @@
+@@ -5727,29 +6817,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10092,7 +10131,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5777,24 +6862,36 @@
+@@ -5776,24 +6865,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10137,7 +10176,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5803,8 +6900,10 @@
+@@ -5802,8 +6903,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10145,11 +10184,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5817,28 +6916,27 @@
+@@ -5816,28 +6919,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10186,7 +10225,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5865,24 +6963,36 @@
+@@ -5864,24 +6966,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10231,7 +10270,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5891,8 +7001,10 @@
+@@ -5890,8 +7004,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10239,11 +10278,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5905,28 +7017,27 @@
+@@ -5904,28 +7020,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10280,7 +10319,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5953,24 +7064,36 @@
+@@ -5952,24 +7067,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10325,7 +10364,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5979,8 +7102,10 @@
+@@ -5978,8 +7105,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10333,11 +10372,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5993,28 +7118,27 @@
+@@ -5992,28 +7121,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10374,7 +10413,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6041,24 +7165,36 @@
+@@ -6040,24 +7168,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10419,7 +10458,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6067,8 +7203,10 @@
+@@ -6066,8 +7206,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10427,11 +10466,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6081,28 +7219,27 @@
+@@ -6080,28 +7222,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10468,7 +10507,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6129,24 +7266,36 @@
+@@ -6128,24 +7269,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10513,7 +10552,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6155,8 +7304,10 @@
+@@ -6154,8 +7307,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10521,11 +10560,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6169,13 +7320,13 @@
+@@ -6168,13 +7323,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10543,7 +10582,7 @@
   :
  
  fi
-@@ -6282,13 +7433,13 @@
+@@ -6281,13 +7436,13 @@
  fi
  
  
@@ -10560,7 +10599,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6318,8 +7469,13 @@
+@@ -6317,8 +7472,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -10576,7 +10615,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6344,9 +7500,10 @@
+@@ -6343,9 +7503,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -10588,7 +10627,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6356,8 +7513,13 @@
+@@ -6355,8 +7516,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -10604,7 +10643,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6384,6 +7546,7 @@
+@@ -6383,6 +7549,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -10612,7 +10651,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6401,8 +7564,8 @@
+@@ -6400,8 +7567,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -10623,7 +10662,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6425,8 +7588,13 @@
+@@ -6424,8 +7591,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -10639,7 +10678,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6451,9 +7619,10 @@
+@@ -6450,9 +7622,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -10651,7 +10690,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6463,8 +7632,13 @@
+@@ -6462,8 +7635,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -10667,7 +10706,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6491,6 +7665,7 @@
+@@ -6490,6 +7668,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -10675,7 +10714,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6517,16 +7692,15 @@
+@@ -6516,16 +7695,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -10696,7 +10735,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6553,24 +7727,36 @@
+@@ -6552,24 +7730,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10741,7 +10780,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6579,8 +7765,10 @@
+@@ -6578,8 +7768,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10749,11 +10788,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6593,22 +7781,21 @@
+@@ -6592,22 +7784,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10782,7 +10821,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6624,36 +7811,36 @@
+@@ -6623,36 +7814,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -10829,7 +10868,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6680,24 +7867,36 @@
+@@ -6679,24 +7870,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10874,7 +10913,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6706,8 +7905,10 @@
+@@ -6705,8 +7908,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10882,11 +10921,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6720,29 +7921,28 @@
+@@ -6719,29 +7924,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10924,7 +10963,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6769,24 +7969,36 @@
+@@ -6768,24 +7972,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10969,7 +11008,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6795,8 +8007,10 @@
+@@ -6794,8 +8010,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10977,11 +11016,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6809,13 +8023,13 @@
+@@ -6808,13 +8026,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10999,7 +11038,7 @@
   :
  
  fi
-@@ -6825,13 +8039,13 @@
+@@ -6824,13 +8042,13 @@
  
  
  
@@ -11017,7 +11056,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6844,13 +8058,13 @@
+@@ -6843,13 +8061,13 @@
  
  
  
@@ -11035,7 +11074,7 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6861,216 +8075,36 @@
+@@ -6860,216 +8078,36 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -11048,9 +11087,25 @@
 -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
 -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++
++
++
++  # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
++  kde_use_nmcheck=no
++fi
  
  
++  if test "$kde_use_nmcheck" = "yes"; then
++      KDE_USE_NMCHECK_TRUE=""
++      KDE_USE_NMCHECK_FALSE="#"
++   else
++      KDE_USE_NMCHECK_TRUE="#"
++      KDE_USE_NMCHECK_FALSE=""
++  fi
  
 -   ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11059,14 +11114,8 @@
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+  # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
-+else
-+  kde_use_nmcheck=no
-+fi
- 
- 
+-
+-
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -11075,14 +11124,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+  if test "$kde_use_nmcheck" = "yes"; then
-+      KDE_USE_NMCHECK_TRUE=""
-+      KDE_USE_NMCHECK_FALSE="#"
-+   else
-+      KDE_USE_NMCHECK_TRUE="#"
-+      KDE_USE_NMCHECK_FALSE=""
-+  fi
- 
+-
 -int
 -main ()
 -{
@@ -11257,8 +11299,8 @@
  
  
  
- 
 -
+-
 -# Check whether --enable-shared or --disable-shared was given.
 +# Check whether --enable-shared was given.
  if test "${enable_shared+set}" = set; then
@@ -11268,15 +11310,15 @@
      case $enableval in
      yes) enable_shared=yes ;;
      no) enable_shared=no ;;
-@@ -7089,12 +8123,12 @@
+@@ -7088,12 +8126,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"
@@ -11285,7 +11327,7 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -7113,7 +8147,8 @@
+@@ -7112,18 +8150,19 @@
      esac
  else
    enable_static=no
@@ -11295,23 +11337,22 @@
  
  
  
-@@ -7122,11 +8157,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
+ else
+   kdelibsuff="auto"
+-fi;
 +fi
 +
  
      if test "$kdelibsuff" = "auto"; then
  
-@@ -7147,8 +8182,8 @@
+@@ -7144,8 +8183,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -11322,7 +11363,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7164,14 +8199,13 @@
+@@ -7161,14 +8200,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -11341,22 +11382,22 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7190,10 +8224,11 @@
+@@ -7187,10 +8225,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
-@@ -7217,7 +8252,7 @@
+@@ -7214,7 +8253,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
@@ -11365,7 +11406,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7246,37 +8281,184 @@
+@@ -7243,37 +8282,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -11441,10 +11482,7 @@
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
@@ -11455,12 +11493,18 @@
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
 +
-+
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   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'
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
@@ -11468,11 +11512,8 @@
 +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
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
++  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
@@ -11567,7 +11608,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -7305,11 +8487,11 @@
+@@ -7302,11 +8488,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -11583,7 +11624,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7322,7 +8504,7 @@
+@@ -7319,7 +8505,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,
@@ -11592,7 +11633,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'*)
-@@ -7342,21 +8524,21 @@
+@@ -7339,21 +8525,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -11621,7 +11662,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7366,29 +8548,38 @@
+@@ -7363,29 +8549,38 @@
    ;;
  esac
  fi
@@ -11668,7 +11709,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7396,56 +8587,63 @@
+@@ -7393,56 +8588,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -11766,7 +11807,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7472,44 +8670,36 @@
+@@ -7469,44 +8671,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -11821,7 +11862,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7525,7 +8715,7 @@
+@@ -7522,7 +8716,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -11830,7 +11871,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
-@@ -7541,43 +8731,27 @@
+@@ -7538,43 +8732,27 @@
    esac
    ;;
  
@@ -11887,7 +11928,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
-@@ -7596,32 +8770,22 @@
+@@ -7593,32 +8771,22 @@
    ;;
  
  openbsd*)
@@ -11923,7 +11964,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]'
-@@ -7642,17 +8806,20 @@
+@@ -7639,17 +8807,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -11947,7 +11988,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7661,14 +8828,17 @@
+@@ -7658,14 +8829,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -11968,16 +12009,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7695,7 +8865,7 @@
+@@ -7692,7 +8866,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7698 "configure"' > conftest.$ac_ext
-+  echo '#line 8868 "configure"' > conftest.$ac_ext
+-  echo '#line 7695 "configure"' > conftest.$ac_ext
++  echo '#line 8869 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7738,14 +8908,13 @@
+@@ -7735,14 +8909,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -11994,7 +12035,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7757,7 +8926,6 @@
+@@ -7754,7 +8927,6 @@
        esac
        ;;
      *64-bit*)
@@ -12002,7 +12043,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7782,8 +8950,8 @@
+@@ -7779,8 +8951,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -12013,7 +12054,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7809,24 +8977,36 @@
+@@ -7806,24 +8978,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12058,7 +12099,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7835,9 +9015,10 @@
+@@ -7832,9 +9016,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12067,11 +12108,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -7846,25 +9027,45 @@
+@@ -7843,22 +9028,42 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -12085,17 +12126,6 @@
    fi
    ;;
 -
--esac
--
--need_locks="$enable_libtool_lock"
--
--
--
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
--if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
 +sparc*-*solaris*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
@@ -12117,21 +12147,20 @@
 +  ;;
 +
 +
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+
-+
+ esac
+ 
+ need_locks="$enable_libtool_lock"
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7885,24 +9086,36 @@
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7882,24 +9087,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12176,7 +12205,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7911,9 +9124,10 @@
+@@ -7908,9 +9125,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12189,7 +12218,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7969,6 +9183,7 @@
+@@ -7966,6 +9184,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -12197,7 +12226,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7988,18 +9203,27 @@
+@@ -7985,18 +9204,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -12231,7 +12260,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8012,12 +9236,14 @@
+@@ -8009,12 +9237,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -12249,7 +12278,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8040,9 +9266,9 @@
+@@ -8037,9 +9267,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12262,7 +12291,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8056,24 +9282,36 @@
+@@ -8053,24 +9283,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12307,7 +12336,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8082,12 +9320,14 @@
+@@ -8079,12 +9321,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12326,7 +12355,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8102,18 +9342,19 @@
+@@ -8099,18 +9343,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12354,7 +12383,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8124,24 +9365,36 @@
+@@ -8121,24 +9366,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12399,7 +12428,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8150,15 +9403,16 @@
+@@ -8147,15 +9404,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12422,7 +12451,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8167,8 +9421,13 @@
+@@ -8164,8 +9422,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -12438,7 +12467,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8192,9 +9451,10 @@
+@@ -8189,9 +9452,10 @@
  
    ac_header_preproc=no
  fi
@@ -12451,7 +12480,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8218,25 +9478,19 @@
+@@ -8215,25 +9479,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;}
@@ -12484,7 +12513,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8248,324 +9502,693 @@
+@@ -8245,343 +9503,709 @@
  
  done
  
@@ -12597,7 +12626,7 @@
 -
 -
 -# Provide some information about the compiler.
--echo "$as_me:8343:" \
+-echo "$as_me:8340:" \
 -     "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
@@ -12768,25 +12797,24 @@
 +  else
 +    ac_cpp_err=
 +  fi
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_prog_f77_g=no
++else
 +  ac_cpp_err=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +if test -z "$ac_cpp_err"; then
 +  # Broken: success on invalid input.
 +continue
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
+-ac_cv_prog_f77_g=no
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
  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
 -if test "$ac_test_FFLAGS" = set; then
@@ -12794,7 +12822,9 @@
 -elif test $ac_cv_prog_f77_g = yes; then
 -  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
 -    FFLAGS="-g -O2"
-+
+-  else
+-    FFLAGS="-g"
+-  fi
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -12809,7 +12839,9 @@
 +
 +fi
 +  CXXCPP=$ac_cv_prog_CXXCPP
-+else
+ else
+-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+-    FFLAGS="-O2"
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
@@ -12853,26 +12885,38 @@
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
    else
--    FFLAGS="-g"
+-    FFLAGS=
 +    ac_cpp_err=
    fi
- else
--  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
--    FFLAGS="-O2"
++else
 +  ac_cpp_err=yes
-+fi
+ fi
 +if test -z "$ac_cpp_err"; then
 +  :
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-G77=`test $ac_compiler_gnu = yes && echo yes`
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
 +  # Broken: fails on valid input.
 +continue
 +fi
-+
+ 
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 +rm -f conftest.err conftest.$ac_ext
-+
+ 
+-# 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
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
@@ -12899,11 +12943,12 @@
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
 +    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-   else
--    FFLAGS=
++  else
 +    ac_cpp_err=
-   fi
-+else
++  fi
+ else
+-    i=0
+-  testring="ABCD"
 +  ac_cpp_err=yes
 +fi
 +if test -z "$ac_cpp_err"; then
@@ -12912,20 +12957,38 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-  case $build_os in
+-  msdosdjgpp*)
+-    # On DJGPP, this test can blow up pretty badly due to problems in libc
+-    # (any single argument exceeding 2000 bytes causes a buffer overrun
+-    # during glob expansion).  Even if it were fixed, the result of this
+-    # check would be larger than it should be.
+-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+-    ;;
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
- fi
++fi
  
--G77=`test $ac_compiler_gnu = yes && echo yes`
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-  gnu*)
+-    # Under GNU Hurd, this test is not required because there is
+-    # no limit to the length of command line arguments.
+-    # Libtool will interpret -1 as no limit whatsoever
+-    lt_cv_sys_max_cmd_len=-1;
+-    ;;
 +rm -f conftest.err conftest.$ac_ext
  
+-  cygwin* | mingw*)
+-    # On Win9x/ME, this test blows up -- it succeeds, but takes
+-    # about 5 minutes as the teststring grows exponentially.
+-    # Worse, since 9x/ME are not pre-emptively multitasking,
+-    # you end up with a "frozen" computer, even though with patience
+-    # the test eventually succeeds (with a max line length of 256k).
+-    # Instead, let's just punt: use the minimum linelength reported by
+-    # all of the supported platforms: 8192 (on NT/2K/XP).
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.err conftest.$ac_ext
@@ -12939,19 +13002,37 @@
 +   { (exit 1); exit 1; }; }
 +fi
  
+- *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      testring=$testring$testring
+-    done
+-    testring=
+-    # 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.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+-    ;;
+-  esac
 +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
  
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+fi
+ fi
  
--# 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
--if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+-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
 +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'
@@ -12964,26 +13045,12 @@
 +{ 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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--    i=0
--  testring="ABCD"
+-  echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
+-fi
 -
--  case $build_os in
--  msdosdjgpp*)
--    # On DJGPP, this test can blow up pretty badly due to problems in libc
--    # (any single argument exceeding 2000 bytes causes a buffer overrun
--    # during glob expansion).  Even if it were fixed, the result of this
--    # check would be larger than it should be.
--    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
--    ;;
--
--  gnu*)
--    # Under GNU Hurd, this test is not required because there is
--    # no limit to the length of command line arguments.
--    # Libtool will interpret -1 as no limit whatsoever
--    lt_cv_sys_max_cmd_len=-1;
--    ;;
 +  if test -n "$F77"; then
 +  ac_cv_prog_F77="$F77" # Let the user override the test.
 +else
@@ -13002,16 +13069,6 @@
 +done
 +IFS=$as_save_IFS
  
--  cygwin* | mingw*)
--    # On Win9x/ME, this test blows up -- it succeeds, but takes
--    # about 5 minutes as the teststring grows exponentially.
--    # Worse, since 9x/ME are not pre-emptively multitasking,
--    # you end up with a "frozen" computer, even though with patience
--    # the test eventually succeeds (with a max line length of 256k).
--    # Instead, let's just punt: use the minimum linelength reported by
--    # all of the supported platforms: 8192 (on NT/2K/XP).
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
 +fi
 +fi
 +F77=$ac_cv_prog_F77
@@ -13023,30 +13080,14 @@
 +echo "${ECHO_T}no" >&6; }
 +fi
  
-- *)
--    # If test is not a shell built-in, we'll probably end up computing a
--    # maximum length that is only half of the actual maximum length, but
--    # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
--	       = "XX$testring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$testring" : ".*" 2>&1` &&
--	    lt_cv_sys_max_cmd_len=$new_result &&
--	    test $i != 17 # 1/2 MB should be enough
--    do
--      i=`expr $i + 1`
--      testring=$testring$testring
--    done
--    testring=
--    # 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.
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
--    ;;
--  esac
  
+-# 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
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
 +    test -n "$F77" && break
 +  done
- fi
++fi
 +if test -z "$F77"; then
 +  ac_ct_F77=$F77
 +  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
@@ -13056,8 +13097,8 @@
 +{ 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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
 +  if test -n "$ac_ct_F77"; then
 +  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
 +else
@@ -13076,26 +13117,32 @@
 +done
 +IFS=$as_save_IFS
  
--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
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[BCDEGRST]'
 +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; }
- else
--  echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
++fi
  
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
 +  test -n "$ac_ct_F77" && break
 +done
  
+-# 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'"
 +  if test "x$ac_ct_F77" = x; then
 +    F77=""
 +  else
@@ -13113,14 +13160,11 @@
 +  fi
 +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
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+-# Transform an extracted symbol line into symbol name and symbol address
+-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'"
  
--# These are sane defaults that work on at least a few old systems.
+-# Define system-specific variables.
+-case $host_os in
 +# Provide some information about the compiler.
 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
@@ -13438,20 +13482,26 @@
 +else
 +
 +# These are sane defaults that work on at least a few old systems.
- # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
- 
- # Character class describing NM global symbol codes.
-@@ -8574,9 +10197,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
-@@ -8598,14 +10218,30 @@
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# 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'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++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'"
++
++# Define system-specific variables.
++case $host_os in
+ aix*)
+   symcode='[BCDT]'
+   ;;
+@@ -8595,14 +10219,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'"
    ;;
@@ -13484,7 +13534,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8623,14 +10259,17 @@
+@@ -8620,14 +10260,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -13504,7 +13554,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8748,15 +10387,15 @@
+@@ -8745,15 +10388,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
@@ -13526,7 +13576,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8770,8 +10409,8 @@
+@@ -8767,8 +10410,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -13537,7 +13587,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8792,7 +10431,7 @@
+@@ -8789,7 +10432,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -13546,7 +13596,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8812,7 +10451,7 @@
+@@ -8809,7 +10452,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -13555,7 +13605,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8822,8 +10461,8 @@
+@@ -8819,8 +10462,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
@@ -13566,7 +13616,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8836,32 +10475,34 @@
+@@ -8833,32 +10476,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13608,7 +13658,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8874,27 +10515,41 @@
+@@ -8871,27 +10516,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13657,7 +13707,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8902,8 +10557,8 @@
+@@ -8899,8 +10558,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
@@ -13668,7 +13718,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8916,32 +10571,34 @@
+@@ -8913,32 +10572,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13710,7 +13760,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8954,27 +10611,41 @@
+@@ -8951,27 +10612,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13759,7 +13809,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8982,8 +10653,8 @@
+@@ -8979,8 +10654,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
@@ -13770,7 +13820,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8996,32 +10667,34 @@
+@@ -8993,32 +10668,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13812,7 +13862,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9034,27 +10707,41 @@
+@@ -9031,27 +10708,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13861,7 +13911,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9069,6 +10756,7 @@
+@@ -9066,6 +10757,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -13869,7 +13919,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9088,21 +10776,32 @@
+@@ -9085,21 +10777,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -13906,7 +13956,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9122,7 +10821,7 @@
+@@ -9119,7 +10822,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13915,7 +13965,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
-@@ -9154,17 +10853,17 @@
+@@ -9151,17 +10854,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -13939,7 +13989,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9184,7 +10883,7 @@
+@@ -9181,7 +10884,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13948,7 +13998,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
-@@ -9216,11 +10915,11 @@
+@@ -9213,11 +10916,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -13964,7 +14014,7 @@
  fi
  
    else
-@@ -9235,21 +10934,21 @@
+@@ -9232,21 +10935,21 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -13993,7 +14043,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -9279,68 +10978,25 @@
+@@ -9276,68 +10979,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14077,7 +14127,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9354,8 +11010,8 @@
+@@ -9351,8 +11011,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -14088,7 +14138,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9369,26 +11025,28 @@
+@@ -9366,26 +11026,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 \
@@ -14096,13 +14146,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:9375: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11031: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9372: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11032: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9379: \$? = $ac_status" >&5
-+   echo "$as_me:11035: \$? = $ac_status" >&5
+-   echo "$as_me:9376: \$? = $ac_status" >&5
++   echo "$as_me:11036: \$? = $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
@@ -14124,7 +14174,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9402,8 +11060,8 @@
+@@ -9399,8 +11061,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -14135,7 +14185,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9441,6 +11099,11 @@
+@@ -9438,6 +11100,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -14147,7 +14197,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9457,7 +11120,7 @@
+@@ -9454,7 +11121,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -14156,7 +14206,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9483,6 +11146,16 @@
+@@ -9480,6 +11147,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -14173,7 +14223,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9494,7 +11167,7 @@
+@@ -9491,7 +11168,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.
@@ -14182,7 +14232,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9517,13 +11190,20 @@
+@@ -9514,13 +11191,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14205,7 +14255,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9538,15 +11218,15 @@
+@@ -9535,15 +11219,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -14227,7 +14277,7 @@
        ;;
  
      sunos4*)
-@@ -9555,7 +11235,7 @@
+@@ -9552,7 +11236,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14236,7 +14286,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9568,6 +11248,17 @@
+@@ -9565,6 +11249,17 @@
        fi
        ;;
  
@@ -14254,7 +14304,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9579,16 +11270,16 @@
+@@ -9576,16 +11271,16 @@
      esac
    fi
  
@@ -14275,7 +14325,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9602,26 +11293,28 @@
+@@ -9599,26 +11294,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 \
@@ -14283,13 +14333,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:9608: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11299: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9605: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11300: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9612: \$? = $ac_status" >&5
-+   echo "$as_me:11303: \$? = $ac_status" >&5
+-   echo "$as_me:9609: \$? = $ac_status" >&5
++   echo "$as_me:11304: \$? = $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
@@ -14311,7 +14361,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9634,7 +11327,7 @@
+@@ -9631,7 +11328,7 @@
  fi
  
  fi
@@ -14320,7 +14370,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9644,8 +11337,50 @@
+@@ -9641,8 +11338,50 @@
      ;;
  esac
  
@@ -14373,7 +14423,7 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9656,60 +11391,58 @@
+@@ -9653,60 +11392,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -14394,13 +14444,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:9675: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11403: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9672: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11404: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9679: \$? = $ac_status" >&5
-+   echo "$as_me:11407: \$? = $ac_status" >&5
+-   echo "$as_me:9676: \$? = $ac_status" >&5
++   echo "$as_me:11408: \$? = $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
@@ -14452,7 +14502,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9719,8 +11452,8 @@
+@@ -9716,8 +11453,8 @@
    need_locks=no
  fi
  
@@ -14463,7 +14513,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9758,6 +11491,16 @@
+@@ -9755,6 +11492,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -14480,7 +14530,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9768,6 +11511,10 @@
+@@ -9765,6 +11512,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -14491,7 +14541,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9778,6 +11525,27 @@
+@@ -9775,6 +11526,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -14519,7 +14569,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9815,7 +11583,7 @@
+@@ -9812,7 +11584,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -14528,7 +14578,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9825,13 +11593,13 @@
+@@ -9822,13 +11594,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'
@@ -14545,7 +14595,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
-@@ -9840,23 +11608,70 @@
+@@ -9837,23 +11609,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -14621,7 +14671,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9870,13 +11685,40 @@
+@@ -9867,13 +11686,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14664,7 +14714,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9886,24 +11728,19 @@
+@@ -9883,24 +11729,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14696,7 +14746,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9915,7 +11752,7 @@
+@@ -9912,7 +11753,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -14705,7 +14755,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9937,9 +11774,21 @@
+@@ -9934,9 +11775,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
@@ -14729,7 +14779,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9956,7 +11805,7 @@
+@@ -9953,7 +11806,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -14738,7 +14788,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`
-@@ -9975,8 +11824,12 @@
+@@ -9972,8 +11825,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -14751,7 +14801,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9984,22 +11837,23 @@
+@@ -9981,22 +11838,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -14782,7 +14832,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10015,24 +11869,36 @@
+@@ -10012,24 +11870,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14827,7 +14877,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10046,19 +11912,20 @@
+@@ -10043,19 +11913,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14835,7 +14885,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -14853,7 +14903,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10077,24 +11944,36 @@
+@@ -10074,24 +11945,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14898,7 +14948,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10108,8 +11987,10 @@
+@@ -10105,8 +11988,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14906,11 +14956,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10118,13 +11999,11 @@
+@@ -10115,13 +12000,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -14927,7 +14977,7 @@
  	fi
        fi
        ;;
-@@ -10137,7 +12016,7 @@
+@@ -10134,7 +12017,7 @@
        ld_shlibs=no
        ;;
  
@@ -14936,7 +14986,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10147,13 +12026,13 @@
+@@ -10144,13 +12027,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -14953,7 +15003,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.
-@@ -10163,52 +12042,52 @@
+@@ -10160,52 +12043,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -15046,7 +15096,7 @@
      fi
        ;;
  
-@@ -10242,8 +12121,8 @@
+@@ -10239,8 +12122,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15057,7 +15107,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10251,7 +12130,7 @@
+@@ -10248,7 +12131,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -15066,7 +15116,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
-@@ -10265,47 +12144,62 @@
+@@ -10262,47 +12145,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -15153,7 +15203,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10319,7 +12213,7 @@
+@@ -10316,7 +12214,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -15162,7 +15212,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'
-@@ -10329,7 +12223,7 @@
+@@ -10326,7 +12224,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -15171,7 +15221,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10352,7 +12246,8 @@
+@@ -10349,7 +12247,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
@@ -15181,7 +15231,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10362,7 +12257,7 @@
+@@ -10359,7 +12258,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -15190,7 +15240,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10373,14 +12268,14 @@
+@@ -10370,14 +12269,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -15207,7 +15257,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'
-@@ -10392,13 +12287,13 @@
+@@ -10389,13 +12288,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15223,7 +15273,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10406,21 +12301,15 @@
+@@ -10403,21 +12302,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -15249,7 +15299,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'
-@@ -10429,8 +12318,18 @@
+@@ -10426,8 +12319,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15270,7 +15320,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10439,7 +12338,7 @@
+@@ -10436,7 +12339,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.
@@ -15279,7 +15329,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10487,36 +12386,45 @@
+@@ -10484,36 +12387,45 @@
        fi
        ;;
  
@@ -15346,7 +15396,7 @@
        ;;
  
      uts4*)
-@@ -10531,15 +12439,10 @@
+@@ -10528,15 +12440,10 @@
      esac
    fi
  
@@ -15364,7 +15414,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10557,8 +12460,8 @@
+@@ -10554,8 +12461,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.
@@ -15375,7 +15425,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10572,6 +12475,7 @@
+@@ -10569,6 +12476,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -15383,7 +15433,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10594,20 +12498,20 @@
+@@ -10591,20 +12499,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -15409,7 +15459,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10617,7 +12521,20 @@
+@@ -10614,7 +12522,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15431,7 +15481,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10682,7 +12599,7 @@
+@@ -10679,7 +12600,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15440,7 +15490,7 @@
    ;;
  
  beos*)
-@@ -10691,7 +12608,7 @@
+@@ -10688,7 +12609,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -15449,7 +15499,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10707,7 +12624,7 @@
+@@ -10704,7 +12625,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -15458,7 +15508,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10719,7 +12636,8 @@
+@@ -10716,7 +12637,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -15468,7 +15518,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10749,7 +12667,7 @@
+@@ -10746,7 +12668,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15477,7 +15527,7 @@
        ;;
      esac
      ;;
-@@ -10772,7 +12690,7 @@
+@@ -10769,7 +12691,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -15486,7 +15536,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"`
-@@ -10795,20 +12713,17 @@
+@@ -10792,20 +12714,17 @@
    dynamic_linker=no
    ;;
  
@@ -15518,7 +15568,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10826,14 +12741,19 @@
+@@ -10823,14 +12742,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -15540,7 +15590,7 @@
    esac
    ;;
  
-@@ -10853,9 +12773,9 @@
+@@ -10850,9 +12774,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -15552,7 +15602,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10870,7 +12790,7 @@
+@@ -10867,7 +12791,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -15561,7 +15611,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10881,7 +12801,7 @@
+@@ -10878,7 +12802,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -15570,17 +15620,10 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10893,13 +12813,25 @@
+@@ -10890,6 +12814,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
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -15593,17 +15636,10 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+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
-@@ -10936,29 +12868,26 @@
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -10933,29 +12869,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -15640,7 +15676,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,
-@@ -10968,6 +12897,18 @@
+@@ -10965,6 +12898,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -15659,7 +15695,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10977,7 +12918,7 @@
+@@ -10974,7 +12919,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -15668,7 +15704,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11005,8 +12946,13 @@
+@@ -11002,8 +12947,13 @@
  
  openbsd*)
    version_type=sunos
@@ -15683,7 +15719,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
-@@ -11026,7 +12972,7 @@
+@@ -11023,7 +12973,7 @@
  
  os2*)
    libname_spec='$name'
@@ -15692,7 +15728,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11044,13 +12990,6 @@
+@@ -11041,13 +12991,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -15706,7 +15742,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11076,7 +13015,7 @@
+@@ -11073,7 +13016,7 @@
    need_version=yes
    ;;
  
@@ -15715,7 +15751,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'
-@@ -11109,6 +13048,29 @@
+@@ -11106,6 +13049,29 @@
    fi
    ;;
  
@@ -15745,7 +15781,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11120,16 +13082,21 @@
+@@ -11117,16 +13083,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -15773,7 +15809,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11149,8 +13116,8 @@
+@@ -11146,8 +13117,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -15784,7 +15820,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11163,29 +13130,29 @@
+@@ -11160,29 +13131,29 @@
  
  striplib=
  old_striplib=
@@ -15824,7 +15860,7 @@
      ;;
    esac
  fi
-@@ -11217,8 +13184,8 @@
+@@ -11214,8 +13185,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -15835,7 +15871,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11231,40 +13198,52 @@
+@@ -11228,40 +13199,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15900,7 +15936,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11273,14 +13252,15 @@
+@@ -11270,14 +13253,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15909,7 +15945,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -15920,7 +15956,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11294,8 +13274,8 @@
+@@ -11291,8 +13275,8 @@
     ;;
  
    *)
@@ -15931,7 +15967,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11322,53 +13302,59 @@
+@@ -11319,53 +13303,59 @@
  
  #undef shl_load
  
@@ -16010,7 +16046,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11377,18 +13363,19 @@
+@@ -11374,18 +13364,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16019,7 +16055,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -16036,7 +16072,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11401,40 +13388,52 @@
+@@ -11398,40 +13389,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16101,7 +16137,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11443,19 +13442,20 @@
+@@ -11440,19 +13443,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16110,7 +16146,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -16128,7 +16164,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11482,53 +13482,59 @@
+@@ -11479,53 +13483,59 @@
  
  #undef dlopen
  
@@ -16207,7 +16243,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11537,18 +13543,19 @@
+@@ -11534,18 +13544,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16216,7 +16252,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16233,7 +16269,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11561,40 +13568,52 @@
+@@ -11558,40 +13569,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16298,7 +16334,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11603,19 +13622,20 @@
+@@ -11600,19 +13623,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16307,7 +16343,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -16325,7 +16361,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11628,40 +13648,52 @@
+@@ -11625,40 +13649,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16390,7 +16426,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11670,19 +13702,20 @@
+@@ -11667,19 +13703,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16399,7 +16435,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -16417,7 +16453,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11695,40 +13728,52 @@
+@@ -11692,40 +13729,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16482,7 +16518,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11737,14 +13782,15 @@
+@@ -11734,14 +13783,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16491,7 +16527,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -16502,7 +16538,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11779,13 +13825,13 @@
+@@ -11776,13 +13826,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -16519,16 +16555,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11795,7 +13841,7 @@
+@@ -11792,7 +13842,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11798 "configure"
-+#line 13844 "configure"
+-#line 11795 "configure"
++#line 13845 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11852,6 +13898,8 @@
+@@ -11849,6 +13899,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16537,7 +16573,7 @@
  
      exit (status);
  }
-@@ -11861,12 +13909,12 @@
+@@ -11858,12 +13910,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16552,7 +16588,7 @@
      esac
    else :
      # compilation failed
-@@ -11877,13 +13925,13 @@
+@@ -11874,13 +13926,13 @@
  
  
  fi
@@ -16571,16 +16607,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11893,7 +13941,7 @@
+@@ -11890,7 +13942,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11896 "configure"
-+#line 13944 "configure"
+-#line 11893 "configure"
++#line 13945 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11950,6 +13998,8 @@
+@@ -11947,6 +13999,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16589,7 +16625,7 @@
  
      exit (status);
  }
-@@ -11959,12 +14009,12 @@
+@@ -11956,12 +14010,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16604,7 +16640,7 @@
      esac
    else :
      # compilation failed
-@@ -11975,8 +14025,8 @@
+@@ -11972,8 +14026,8 @@
  
  
  fi
@@ -16615,7 +16651,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -11997,19 +14047,19 @@
+@@ -11994,19 +14048,19 @@
  fi
  
  
@@ -16643,7 +16679,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12018,58 +14068,21 @@
+@@ -12015,58 +14069,21 @@
    fi
    ;;
  
@@ -16709,7 +16745,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12084,7 +14097,8 @@
+@@ -12081,7 +14098,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.
@@ -16719,7 +16755,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 \
-@@ -12198,11 +14212,11 @@
+@@ -12195,11 +14213,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16733,7 +16769,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12232,6 +14246,12 @@
+@@ -12229,6 +14247,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -16746,7 +16782,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12243,6 +14263,9 @@
+@@ -12240,6 +14264,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -16756,7 +16792,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12262,7 +14285,7 @@
+@@ -12259,7 +14286,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -16765,7 +16801,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12293,7 +14316,7 @@
+@@ -12290,7 +14317,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -16774,7 +16810,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12308,7 +14331,7 @@
+@@ -12305,7 +14332,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -16783,7 +16819,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12535,7 +14558,10 @@
+@@ -12532,7 +14559,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.
@@ -16795,7 +16831,7 @@
  fi
  
  
-@@ -12548,11 +14574,11 @@
+@@ -12545,11 +14575,11 @@
  CC="$lt_save_CC"
  
  
@@ -16811,7 +16847,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12570,6 +14596,9 @@
+@@ -12567,6 +14597,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -16821,7 +16857,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12600,8 +14629,10 @@
+@@ -12597,8 +14630,10 @@
  
        case $tagname in
        CXX)
@@ -16834,7 +16870,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12620,6 +14651,7 @@
+@@ -12617,6 +14652,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -16842,7 +16878,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12637,7 +14669,7 @@
+@@ -12634,7 +14670,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -16851,7 +16887,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12647,17 +14679,34 @@
+@@ -12644,17 +14680,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -16887,7 +16923,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12668,18 +14717,27 @@
+@@ -12665,18 +14718,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -16918,7 +16954,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12693,18 +14751,18 @@
+@@ -12690,18 +14752,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -16943,7 +16979,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12733,11 +14791,11 @@
+@@ -12730,11 +14792,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -16959,7 +16995,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12750,7 +14808,7 @@
+@@ -12747,7 +14809,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,
@@ -16968,7 +17004,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'*)
-@@ -12770,21 +14828,21 @@
+@@ -12767,21 +14829,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -16997,7 +17033,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12794,8 +14852,8 @@
+@@ -12791,8 +14853,8 @@
    ;;
  esac
  fi
@@ -17008,7 +17044,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12803,8 +14861,8 @@
+@@ -12800,8 +14862,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
@@ -17019,7 +17055,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12830,7 +14888,7 @@
+@@ -12827,7 +14889,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.
@@ -17028,7 +17064,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12845,8 +14903,8 @@
+@@ -12842,8 +14904,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -17039,7 +17075,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12861,8 +14919,23 @@
+@@ -12858,8 +14920,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -17065,7 +17101,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12879,7 +14952,7 @@
+@@ -12876,7 +14953,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -17074,7 +17110,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`
-@@ -12898,8 +14971,12 @@
+@@ -12895,8 +14972,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -17087,7 +17123,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12908,15 +14985,16 @@
+@@ -12905,15 +14986,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -17108,7 +17144,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.
-@@ -12938,24 +15016,36 @@
+@@ -12935,24 +15017,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17153,7 +17189,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12969,20 +15059,21 @@
+@@ -12966,20 +15060,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17161,7 +17197,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -17179,7 +17215,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13001,24 +15092,36 @@
+@@ -12998,24 +15093,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17224,7 +17260,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13032,8 +15135,10 @@
+@@ -13029,8 +15136,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17232,11 +17268,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -13042,16 +15147,26 @@
+@@ -13039,16 +15148,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17268,7 +17304,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13065,12 +15180,12 @@
+@@ -13062,12 +15181,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'
@@ -17283,7 +17319,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
-@@ -13079,70 +15194,81 @@
+@@ -13076,70 +15195,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -17417,7 +17453,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13153,14 +15279,14 @@
+@@ -13150,14 +15280,14 @@
  	;;
      esac
      ;;
@@ -17434,7 +17470,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13177,12 +15303,12 @@
+@@ -13174,12 +15304,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -17450,7 +17486,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13191,11 +15317,11 @@
+@@ -13188,11 +15318,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.
@@ -17464,7 +17500,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13205,33 +15331,22 @@
+@@ -13202,33 +15332,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -17505,7 +17541,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13242,17 +15357,20 @@
+@@ -13239,17 +15358,20 @@
      esac
  
      case $cc_basename in
@@ -17532,7 +17568,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13268,12 +15386,15 @@
+@@ -13265,12 +15387,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -17552,7 +17588,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13284,11 +15405,25 @@
+@@ -13281,11 +15406,25 @@
  	;;
      esac
      ;;
@@ -17580,7 +17616,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13299,9 +15434,9 @@
+@@ -13296,9 +15435,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -17592,7 +17628,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13310,16 +15445,16 @@
+@@ -13307,16 +15446,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -17613,7 +17649,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13337,20 +15472,44 @@
+@@ -13334,20 +15473,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -17646,9 +17682,6 @@
  	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
 -      cxx)
--	# Compaq C++
--	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 +      pgCC*)
 +        # Portland Group C++ compiler
 +	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
@@ -17659,13 +17692,15 @@
 +	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
 +        ;;
 +      cxx*)
-+	# Compaq C++
+ 	# Compaq C++
+-	archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 +	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13378,7 +15537,7 @@
+@@ -13375,7 +15538,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -17674,7 +17709,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13388,7 +15547,7 @@
+@@ -13385,7 +15548,7 @@
  	;;
      esac
      ;;
@@ -17683,7 +17718,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=
-@@ -13399,15 +15558,31 @@
+@@ -13396,15 +15559,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::"'
      ;;
@@ -17717,7 +17752,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13417,14 +15592,14 @@
+@@ -13414,14 +15593,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -17735,7 +17770,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13442,7 +15617,7 @@
+@@ -13439,7 +15618,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17744,7 +17779,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13461,13 +15636,13 @@
+@@ -13458,13 +15637,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -17760,7 +17795,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13476,17 +15651,17 @@
+@@ -13473,17 +15652,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -17782,7 +17817,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13505,7 +15680,7 @@
+@@ -13502,7 +15681,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17791,7 +17826,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13526,27 +15701,14 @@
+@@ -13523,27 +15702,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -17821,7 +17856,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13559,36 +15721,33 @@
+@@ -13556,36 +15722,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -17870,7 +17905,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13596,9 +15755,9 @@
+@@ -13593,9 +15756,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -17882,7 +17917,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13608,9 +15767,9 @@
+@@ -13605,9 +15768,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
@@ -17894,7 +17929,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13619,9 +15778,9 @@
+@@ -13616,9 +15779,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -17906,7 +17941,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13634,12 +15793,63 @@
+@@ -13631,12 +15794,63 @@
  	;;
      esac
      ;;
@@ -17972,7 +18007,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13659,8 +15869,8 @@
+@@ -13656,8 +15870,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -17983,7 +18018,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13696,7 +15906,7 @@
+@@ -13693,7 +15907,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.
@@ -17992,7 +18027,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13736,7 +15946,7 @@
+@@ -13733,7 +15947,7 @@
         fi
         ;;
  
@@ -18001,7 +18036,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13772,6 +15982,29 @@
+@@ -13769,6 +15983,29 @@
  
  $rm -f confest.$objext
  
@@ -18031,7 +18066,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13780,8 +16013,8 @@
+@@ -13777,8 +16014,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -18042,7 +18077,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13819,6 +16052,10 @@
+@@ -13816,6 +16053,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -18053,7 +18088,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13827,7 +16064,7 @@
+@@ -13824,7 +16065,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18062,7 +18097,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13852,18 +16089,28 @@
+@@ -13849,18 +16090,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -18094,7 +18129,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13871,22 +16118,22 @@
+@@ -13868,22 +16119,22 @@
  	    ;;
  	esac
  	;;
@@ -18123,7 +18158,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13899,9 +16146,13 @@
+@@ -13896,9 +16147,13 @@
  	    ;;
  	esac
  	;;
@@ -18138,7 +18173,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13910,20 +16161,26 @@
+@@ -13907,20 +16162,26 @@
  	    ;;
  	esac
  	;;
@@ -18169,7 +18204,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13940,25 +16197,25 @@
+@@ -13937,25 +16198,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -18200,7 +18235,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13972,24 +16229,15 @@
+@@ -13969,24 +16230,15 @@
  	;;
        psos*)
  	;;
@@ -18227,7 +18262,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13999,12 +16247,12 @@
+@@ -13996,12 +16248,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -18242,7 +18277,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14014,7 +16262,7 @@
+@@ -14011,7 +16263,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -18251,7 +18286,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14022,7 +16270,14 @@
+@@ -14019,7 +16271,14 @@
  	    ;;
  	esac
  	;;
@@ -18267,7 +18302,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14032,16 +16287,16 @@
+@@ -14029,16 +16288,16 @@
      esac
    fi
  
@@ -18288,7 +18323,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14055,26 +16310,28 @@
+@@ -14052,26 +16311,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 \
@@ -18296,13 +18331,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:14061: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16316: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14058: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16317: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14065: \$? = $ac_status" >&5
-+   echo "$as_me:16320: \$? = $ac_status" >&5
+-   echo "$as_me:14062: \$? = $ac_status" >&5
++   echo "$as_me:16321: \$? = $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
@@ -18324,7 +18359,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14087,7 +16344,7 @@
+@@ -14084,7 +16345,7 @@
  fi
  
  fi
@@ -18333,7 +18368,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14097,8 +16354,50 @@
+@@ -14094,8 +16355,50 @@
      ;;
  esac
  
@@ -18386,7 +18421,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14109,60 +16408,58 @@
+@@ -14106,60 +16409,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -18407,13 +18442,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:14128: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16420: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14125: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16421: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14132: \$? = $ac_status" >&5
-+   echo "$as_me:16424: \$? = $ac_status" >&5
+-   echo "$as_me:14129: \$? = $ac_status" >&5
++   echo "$as_me:16425: \$? = $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
@@ -18465,7 +18500,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14172,8 +16469,8 @@
+@@ -14169,8 +16470,8 @@
    need_locks=no
  fi
  
@@ -18476,7 +18511,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14190,22 +16487,20 @@
+@@ -14187,22 +16488,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -18505,7 +18540,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14223,8 +16518,8 @@
+@@ -14220,8 +16519,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.
@@ -18516,7 +18551,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14238,6 +16533,7 @@
+@@ -14235,6 +16534,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -18524,7 +18559,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14260,20 +16556,20 @@
+@@ -14257,20 +16557,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -18550,7 +18585,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14283,7 +16579,20 @@
+@@ -14280,7 +16580,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18572,7 +18607,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14348,7 +16657,7 @@
+@@ -14345,7 +16658,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18581,7 +18616,7 @@
    ;;
  
  beos*)
-@@ -14357,7 +16666,7 @@
+@@ -14354,7 +16667,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -18590,7 +18625,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14373,7 +16682,7 @@
+@@ -14370,7 +16683,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -18599,7 +18634,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14385,7 +16694,8 @@
+@@ -14382,7 +16695,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -18609,7 +18644,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14415,7 +16725,7 @@
+@@ -14412,7 +16726,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18618,7 +18653,7 @@
        ;;
      esac
      ;;
-@@ -14438,7 +16748,7 @@
+@@ -14435,7 +16749,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -18627,7 +18662,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"`
-@@ -14461,20 +16771,17 @@
+@@ -14458,20 +16772,17 @@
    dynamic_linker=no
    ;;
  
@@ -18659,7 +18694,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14492,14 +16799,19 @@
+@@ -14489,14 +16800,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -18681,7 +18716,7 @@
    esac
    ;;
  
-@@ -14519,9 +16831,9 @@
+@@ -14516,9 +16832,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -18693,7 +18728,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14536,7 +16848,7 @@
+@@ -14533,7 +16849,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -18702,7 +18737,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14547,7 +16859,7 @@
+@@ -14544,7 +16860,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -18711,7 +18746,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14559,6 +16871,18 @@
+@@ -14556,6 +16872,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -18730,7 +18765,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14602,29 +16926,26 @@
+@@ -14599,29 +16927,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -18767,7 +18802,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,
-@@ -14634,6 +16955,18 @@
+@@ -14631,6 +16956,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18786,7 +18821,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14643,7 +16976,7 @@
+@@ -14640,7 +16977,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -18795,7 +18830,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14671,8 +17004,13 @@
+@@ -14668,8 +17005,13 @@
  
  openbsd*)
    version_type=sunos
@@ -18810,7 +18845,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
-@@ -14692,7 +17030,7 @@
+@@ -14689,7 +17031,7 @@
  
  os2*)
    libname_spec='$name'
@@ -18819,7 +18854,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14710,13 +17048,6 @@
+@@ -14707,13 +17049,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -18833,7 +18868,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14742,7 +17073,7 @@
+@@ -14739,7 +17074,7 @@
    need_version=yes
    ;;
  
@@ -18842,7 +18877,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'
-@@ -14775,6 +17106,29 @@
+@@ -14772,6 +17107,29 @@
    fi
    ;;
  
@@ -18872,7 +18907,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14786,16 +17140,21 @@
+@@ -14783,16 +17141,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -18900,7 +18935,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14815,8 +17174,8 @@
+@@ -14812,8 +17175,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -18911,7 +18946,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14827,1242 +17186,420 @@
+@@ -14824,1242 +17187,420 @@
    enable_fast_install=needless
  fi
  
@@ -19713,7 +19748,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15464 "configure"
+-#line 15461 "configure"
 -#include "confdefs.h"
 +# Do we need a version for libraries?
 +need_version=$need_version
@@ -19833,7 +19868,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15562 "configure"
+-#line 15559 "configure"
 -#include "confdefs.h"
 +# List of archive names.  First name is the real one, the rest are links.
 +# The last name is the one that the linker finds with -lNAME.
@@ -20466,7 +20501,7 @@
  
  CC=$lt_save_CC
  LDCXX=$LD
-@@ -16126,29 +17663,55 @@
+@@ -16123,29 +17664,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -20506,19 +20541,19 @@
 +  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
++
 +{ 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
@@ -20530,7 +20565,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16156,21 +17719,21 @@
+@@ -16153,21 +17720,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -20562,7 +20597,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16179,8 +17742,8 @@
+@@ -16176,8 +17743,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -20573,7 +20608,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16218,6 +17781,11 @@
+@@ -16215,6 +17782,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -20585,7 +20620,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16234,7 +17802,7 @@
+@@ -16231,7 +17803,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -20594,7 +20629,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16260,6 +17828,16 @@
+@@ -16257,6 +17829,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -20611,7 +20646,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16271,7 +17849,7 @@
+@@ -16268,7 +17850,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.
@@ -20620,7 +20655,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16294,13 +17872,20 @@
+@@ -16291,13 +17873,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20643,7 +20678,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16315,15 +17900,15 @@
+@@ -16312,15 +17901,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -20665,7 +20700,7 @@
        ;;
  
      sunos4*)
-@@ -16332,7 +17917,7 @@
+@@ -16329,7 +17918,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20674,7 +20709,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16345,6 +17930,17 @@
+@@ -16342,6 +17931,17 @@
        fi
        ;;
  
@@ -20692,7 +20727,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16356,16 +17952,16 @@
+@@ -16353,16 +17953,16 @@
      esac
    fi
  
@@ -20713,7 +20748,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16379,26 +17975,28 @@
+@@ -16376,26 +17976,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 \
@@ -20721,13 +20756,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:16385: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17981: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16382: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17982: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16389: \$? = $ac_status" >&5
-+   echo "$as_me:17985: \$? = $ac_status" >&5
+-   echo "$as_me:16386: \$? = $ac_status" >&5
++   echo "$as_me:17986: \$? = $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
@@ -20749,7 +20784,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16411,7 +18009,7 @@
+@@ -16408,7 +18010,7 @@
  fi
  
  fi
@@ -20758,7 +20793,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16421,24 +18019,59 @@
+@@ -16418,72 +18020,112 @@
      ;;
  esac
  
@@ -20787,6 +20822,7 @@
 -   # to fail, enabling locking or at least warning the user not to do parallel
 -   # builds.
 -   chmod -w .
+-
 +  lt_prog_compiler_static_works_F77=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -20831,10 +20867,10 @@
 +   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
-@@ -16446,47 +18079,52 @@
+    # (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 \
@@ -20842,13 +20878,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:16452: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18085: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16449: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18086: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16456: \$? = $ac_status" >&5
-+   echo "$as_me:18089: \$? = $ac_status" >&5
+-   echo "$as_me:16453: \$? = $ac_status" >&5
++   echo "$as_me:18090: \$? = $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
@@ -20900,7 +20936,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16496,8 +18134,8 @@
+@@ -16493,8 +18135,8 @@
    need_locks=no
  fi
  
@@ -20911,7 +20947,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16535,6 +18173,16 @@
+@@ -16532,6 +18174,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -20928,7 +20964,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16545,6 +18193,10 @@
+@@ -16542,6 +18194,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -20939,7 +20975,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16555,6 +18207,27 @@
+@@ -16552,6 +18208,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -20967,7 +21003,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16592,7 +18265,7 @@
+@@ -16589,7 +18266,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -20976,7 +21012,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16602,13 +18275,13 @@
+@@ -16599,13 +18276,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'
@@ -20993,7 +21029,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
-@@ -16617,23 +18290,70 @@
+@@ -16614,23 +18291,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -21070,7 +21106,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16647,13 +18367,40 @@
+@@ -16644,13 +18368,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21113,7 +21149,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16663,24 +18410,19 @@
+@@ -16660,24 +18411,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21145,7 +21181,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16692,7 +18434,7 @@
+@@ -16689,7 +18435,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -21154,7 +21190,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16714,9 +18456,21 @@
+@@ -16711,9 +18457,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
@@ -21178,7 +21214,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16733,7 +18487,7 @@
+@@ -16730,7 +18488,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -21187,7 +21223,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`
-@@ -16752,8 +18506,12 @@
+@@ -16749,8 +18507,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -21200,7 +21236,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16761,45 +18519,58 @@
+@@ -16758,45 +18520,58 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -21274,7 +21310,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16813,19 +18584,20 @@
+@@ -16810,19 +18585,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21282,7 +21318,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -21300,7 +21336,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16834,24 +18606,36 @@
+@@ -16831,24 +18607,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21345,7 +21381,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16865,8 +18649,10 @@
+@@ -16862,8 +18650,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21353,11 +21389,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16875,13 +18661,11 @@
+@@ -16872,13 +18662,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -21374,7 +21410,7 @@
  	fi
        fi
        ;;
-@@ -16894,7 +18678,7 @@
+@@ -16891,7 +18679,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -21383,7 +21419,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16904,68 +18688,68 @@
+@@ -16901,68 +18689,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -21496,7 +21532,7 @@
      fi
        ;;
  
-@@ -16999,8 +18783,8 @@
+@@ -16996,8 +18784,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21507,7 +21543,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17008,7 +18792,7 @@
+@@ -17005,7 +18793,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -21516,7 +21552,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
-@@ -17022,47 +18806,62 @@
+@@ -17019,47 +18807,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -21603,7 +21639,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17076,7 +18875,7 @@
+@@ -17073,7 +18876,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -21612,7 +21648,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'
-@@ -17086,7 +18885,7 @@
+@@ -17083,7 +18886,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -21621,7 +21657,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
-@@ -17109,7 +18908,8 @@
+@@ -17106,7 +18909,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
@@ -21631,7 +21667,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17119,7 +18919,7 @@
+@@ -17116,7 +18920,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -21640,7 +21676,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17130,14 +18930,14 @@
+@@ -17127,14 +18931,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -21657,7 +21693,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'
-@@ -17149,13 +18949,13 @@
+@@ -17146,13 +18950,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21673,7 +21709,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17163,21 +18963,15 @@
+@@ -17160,21 +18964,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -21699,7 +21735,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'
-@@ -17186,8 +18980,18 @@
+@@ -17183,8 +18981,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21720,7 +21756,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17196,7 +19000,7 @@
+@@ -17193,7 +19001,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.
@@ -21729,7 +21765,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17244,36 +19048,45 @@
+@@ -17241,36 +19049,45 @@
        fi
        ;;
  
@@ -21796,7 +21832,7 @@
        ;;
  
      uts4*)
-@@ -17288,15 +19101,10 @@
+@@ -17285,15 +19102,10 @@
      esac
    fi
  
@@ -21814,7 +21850,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17314,8 +19122,8 @@
+@@ -17311,8 +19123,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.
@@ -21825,7 +21861,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17329,6 +19137,7 @@
+@@ -17326,6 +19138,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -21833,7 +21869,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17351,20 +19160,20 @@
+@@ -17348,20 +19161,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -21859,7 +21895,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17374,7 +19183,20 @@
+@@ -17371,7 +19184,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21881,7 +21917,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17439,7 +19261,7 @@
+@@ -17436,7 +19262,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21890,7 +21926,7 @@
    ;;
  
  beos*)
-@@ -17448,7 +19270,7 @@
+@@ -17445,7 +19271,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -21899,7 +21935,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17464,7 +19286,7 @@
+@@ -17461,7 +19287,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -21908,7 +21944,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17476,7 +19298,8 @@
+@@ -17473,7 +19299,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -21918,7 +21954,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17506,7 +19329,7 @@
+@@ -17503,7 +19330,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21927,7 +21963,7 @@
        ;;
      esac
      ;;
-@@ -17529,7 +19352,7 @@
+@@ -17526,7 +19353,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -21936,7 +21972,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"`
-@@ -17552,20 +19375,17 @@
+@@ -17549,20 +19376,17 @@
    dynamic_linker=no
    ;;
  
@@ -21968,7 +22004,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17583,14 +19403,19 @@
+@@ -17580,14 +19404,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -21990,7 +22026,7 @@
    esac
    ;;
  
-@@ -17610,9 +19435,9 @@
+@@ -17607,9 +19436,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -22002,7 +22038,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17627,7 +19452,7 @@
+@@ -17624,7 +19453,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -22011,7 +22047,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17638,7 +19463,7 @@
+@@ -17635,7 +19464,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -22020,7 +22056,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17650,6 +19475,18 @@
+@@ -17647,6 +19476,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -22039,7 +22075,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17693,29 +19530,26 @@
+@@ -17690,29 +19531,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -22076,7 +22112,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,
-@@ -17725,6 +19559,18 @@
+@@ -17722,6 +19560,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -22095,7 +22131,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17734,7 +19580,7 @@
+@@ -17731,7 +19581,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -22104,7 +22140,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17762,8 +19608,13 @@
+@@ -17759,8 +19609,13 @@
  
  openbsd*)
    version_type=sunos
@@ -22119,7 +22155,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
-@@ -17783,7 +19634,7 @@
+@@ -17780,7 +19635,7 @@
  
  os2*)
    libname_spec='$name'
@@ -22128,7 +22164,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17801,13 +19652,6 @@
+@@ -17798,13 +19653,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -22142,7 +22178,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17833,7 +19677,7 @@
+@@ -17830,7 +19678,7 @@
    need_version=yes
    ;;
  
@@ -22151,10 +22187,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'
-@@ -17866,6 +19710,29 @@
+@@ -17863,9 +19711,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
@@ -22178,10 +22217,13 @@
 +  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}'
-@@ -17877,16 +19744,21 @@
++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
+   ;;
+@@ -17874,16 +19745,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -22209,7 +22251,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17906,8 +19778,8 @@
+@@ -17903,8 +19779,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -22220,7 +22262,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17918,36 +19790,6 @@
+@@ -17915,36 +19791,6 @@
    enable_fast_install=needless
  fi
  
@@ -22257,7 +22299,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17962,7 +19804,8 @@
+@@ -17959,7 +19805,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.
@@ -22267,7 +22309,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 \
-@@ -18062,6 +19905,12 @@
+@@ -18059,6 +19906,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22280,7 +22322,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18073,6 +19922,9 @@
+@@ -18070,6 +19923,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22290,7 +22332,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18092,7 +19944,7 @@
+@@ -18089,7 +19945,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22299,7 +22341,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18123,7 +19975,7 @@
+@@ -18120,7 +19976,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22308,7 +22350,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18138,7 +19990,7 @@
+@@ -18135,7 +19991,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -22317,7 +22359,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18340,7 +20192,10 @@
+@@ -18337,7 +20193,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.
@@ -22329,7 +22371,7 @@
  fi
  
  
-@@ -18361,7 +20216,6 @@
+@@ -18358,7 +20217,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -22337,7 +22379,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18373,26 +20227,55 @@
+@@ -18370,26 +20228,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -22394,7 +22436,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
-@@ -18404,8 +20287,8 @@
+@@ -18401,8 +20288,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -22405,7 +22447,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18419,26 +20302,28 @@
+@@ -18416,26 +20303,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 \
@@ -22413,13 +22455,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:18425: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20308: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18422: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20309: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18429: \$? = $ac_status" >&5
-+   echo "$as_me:20312: \$? = $ac_status" >&5
+-   echo "$as_me:18426: \$? = $ac_status" >&5
++   echo "$as_me:20313: \$? = $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
@@ -22441,7 +22483,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18452,8 +20337,8 @@
+@@ -18449,8 +20338,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -22452,7 +22494,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18491,6 +20376,11 @@
+@@ -18488,6 +20377,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -22464,7 +22506,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18507,7 +20397,7 @@
+@@ -18504,7 +20398,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -22473,7 +22515,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18533,6 +20423,16 @@
+@@ -18530,6 +20424,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -22490,7 +22532,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18544,7 +20444,7 @@
+@@ -18541,7 +20445,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.
@@ -22499,7 +22541,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18567,13 +20467,20 @@
+@@ -18564,13 +20468,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -22522,7 +22564,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18588,15 +20495,15 @@
+@@ -18585,15 +20496,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -22544,7 +22586,7 @@
        ;;
  
      sunos4*)
-@@ -18605,7 +20512,7 @@
+@@ -18602,7 +20513,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -22553,7 +22595,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18618,6 +20525,17 @@
+@@ -18615,6 +20526,17 @@
        fi
        ;;
  
@@ -22571,7 +22613,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18629,16 +20547,16 @@
+@@ -18626,16 +20548,16 @@
      esac
    fi
  
@@ -22592,7 +22634,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18652,26 +20570,28 @@
+@@ -18649,26 +20571,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 \
@@ -22600,13 +22642,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:18658: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20576: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20577: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18662: \$? = $ac_status" >&5
-+   echo "$as_me:20580: \$? = $ac_status" >&5
+-   echo "$as_me:18659: \$? = $ac_status" >&5
++   echo "$as_me:20581: \$? = $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
@@ -22628,7 +22670,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18684,7 +20604,7 @@
+@@ -18681,7 +20605,7 @@
  fi
  
  fi
@@ -22637,7 +22679,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18694,8 +20614,50 @@
+@@ -18691,8 +20615,50 @@
      ;;
  esac
  
@@ -22690,7 +22732,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18706,60 +20668,58 @@
+@@ -18703,60 +20669,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -22711,13 +22753,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:18725: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20680: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18722: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20681: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18729: \$? = $ac_status" >&5
-+   echo "$as_me:20684: \$? = $ac_status" >&5
+-   echo "$as_me:18726: \$? = $ac_status" >&5
++   echo "$as_me:20685: \$? = $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
@@ -22769,7 +22811,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18769,8 +20729,8 @@
+@@ -18766,8 +20730,8 @@
    need_locks=no
  fi
  
@@ -22780,7 +22822,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18808,6 +20768,16 @@
+@@ -18805,6 +20769,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -22797,7 +22839,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18818,6 +20788,10 @@
+@@ -18815,6 +20789,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -22808,7 +22850,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18828,6 +20802,27 @@
+@@ -18825,6 +20803,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -22836,7 +22878,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18865,7 +20860,7 @@
+@@ -18862,7 +20861,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -22845,7 +22887,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18875,13 +20870,13 @@
+@@ -18872,13 +20871,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'
@@ -22862,7 +22904,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
-@@ -18890,23 +20885,70 @@
+@@ -18887,23 +20886,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -22939,7 +22981,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18920,13 +20962,40 @@
+@@ -18917,13 +20963,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22982,7 +23024,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18936,24 +21005,19 @@
+@@ -18933,24 +21006,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23014,7 +23056,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18965,7 +21029,7 @@
+@@ -18962,7 +21030,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -23023,7 +23065,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18987,9 +21051,21 @@
+@@ -18984,9 +21052,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
@@ -23047,7 +23089,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19006,7 +21082,7 @@
+@@ -19003,7 +21083,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -23056,7 +23098,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`
-@@ -19025,8 +21101,12 @@
+@@ -19022,8 +21102,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -23069,7 +23111,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19034,22 +21114,23 @@
+@@ -19031,22 +21115,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -23100,7 +23142,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19065,24 +21146,36 @@
+@@ -19062,24 +21147,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23145,7 +23187,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19096,19 +21189,20 @@
+@@ -19093,19 +21190,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23153,7 +23195,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -23171,7 +23213,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19127,24 +21221,36 @@
+@@ -19124,24 +21222,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23216,7 +23258,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19158,8 +21264,10 @@
+@@ -19155,8 +21265,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23224,11 +23266,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -19168,13 +21276,11 @@
+@@ -19165,13 +21277,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23245,7 +23287,7 @@
  	fi
        fi
        ;;
-@@ -19187,7 +21293,7 @@
+@@ -19184,7 +21294,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -23254,7 +23296,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19197,68 +21303,68 @@
+@@ -19194,68 +21304,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -23367,7 +23409,7 @@
      fi
        ;;
  
-@@ -19292,8 +21398,8 @@
+@@ -19289,8 +21399,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23378,7 +23420,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19301,7 +21407,7 @@
+@@ -19298,7 +21408,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -23387,7 +23429,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
-@@ -19315,47 +21421,62 @@
+@@ -19312,47 +21422,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -23474,7 +23516,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19369,7 +21490,7 @@
+@@ -19366,7 +21491,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -23483,7 +23525,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'
-@@ -19379,7 +21500,7 @@
+@@ -19376,7 +21501,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -23492,7 +23534,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
-@@ -19402,7 +21523,8 @@
+@@ -19399,7 +21524,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
@@ -23502,7 +23544,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19412,7 +21534,7 @@
+@@ -19409,7 +21535,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -23511,7 +23553,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19423,14 +21545,14 @@
+@@ -19420,14 +21546,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -23528,7 +23570,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'
-@@ -19442,13 +21564,13 @@
+@@ -19439,13 +21565,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23544,7 +23586,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19456,21 +21578,15 @@
+@@ -19453,21 +21579,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -23570,7 +23612,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'
-@@ -19479,8 +21595,18 @@
+@@ -19476,8 +21596,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23591,7 +23633,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19489,7 +21615,7 @@
+@@ -19486,7 +21616,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.
@@ -23600,7 +23642,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19537,1513 +21663,746 @@
+@@ -19534,36 +21664,45 @@
        fi
        ;;
  
@@ -23608,22 +23650,30 @@
 -      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_direct_GCJ=yes
 -      hardcode_minus_L_GCJ=no
--      hardcode_shlibpath_var_GCJ=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z,text'
++      archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
 -      hardcode_runpath_var=yes
 -      runpath_var=LD_RUN_PATH
 -      ;;
--
++      runpath_var='LD_RUN_PATH'
+ 
 -   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
 -      no_undefined_flag_GCJ='${wl}-z ${wl}text'
--      if test "$GCC" = yes; then
+       if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--      else
++	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
 -	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--      fi
++	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_GCJ=no
--      ;;
--
+       ;;
+ 
 -    sysv5*)
 -      no_undefined_flag_GCJ=' -z text'
 -      # $CC -shared without GNU ld will not create a library from C++
@@ -23632,289 +23682,177 @@
 -      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
 -      hardcode_libdir_flag_spec_GCJ=
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
 +      no_undefined_flag_GCJ='${wl}-z,text'
++      allow_undefined_flag_GCJ='${wl}-z,nodefs'
 +      archive_cmds_need_lc_GCJ=no
        hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
        runpath_var='LD_RUN_PATH'
--      ;;
--
--    uts4*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_shlibpath_var_GCJ=no
--      ;;
--
--    *)
--      ld_shlibs_GCJ=no
--      ;;
--    esac
--  fi
--
++
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
+       ;;
+ 
+     uts4*)
+@@ -19578,15 +21717,10 @@
+     esac
+   fi
+ 
 -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6
--test "$ld_shlibs_GCJ" = no && can_build_shared=no
--
++{ 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"
 -if test "$GCC" = yes; then
 -  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 -fi
- 
--#
--# Do we need to explicitly link libc?
--#
--case "x$archive_cmds_need_lc_GCJ" in
--x|xyes)
--  # Assume -lc should be added
--  archive_cmds_need_lc_GCJ=yes
 -
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds_GCJ in
--    *'~'*)
--      # FIXME: we may have to deal with multi-command sequences.
--      ;;
--    '$CC '*)
--      # 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.
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -19604,8 +21738,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
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$lt_prog_compiler_wl_GCJ
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
--        allow_undefined_flag_GCJ=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
--  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--        then
--	  archive_cmds_need_lc_GCJ=no
--        else
--	  archive_cmds_need_lc_GCJ=yes
--        fi
--        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $rm conftest*
++      { 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
+ 
+@@ -19619,6 +21753,7 @@
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl_GCJ
++	pic_flag=$lt_prog_compiler_pic_GCJ
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+@@ -19641,20 +21776,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
--      ;;
--    esac
--  fi
--  ;;
--esac
--
++      { 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
--library_names_spec=
--libname_spec='lib$name'
--soname_spec=
++{ 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=
 -shrext=".so"
--postinstall_cmds=
--postuninstall_cmds=
--finish_cmds=
--finish_eval=
--shlibpath_var=
--shlibpath_overrides_runpath=unknown
--version_type=none
--dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -19664,7 +21799,20 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--need_lib_prefix=unknown
--hardcode_into_libs=no
--
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
--
--case $host_os in
--aix3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
--  shlibpath_var=LIBPATH
--
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
--
--aix4* | aix5*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  hardcode_into_libs=yes
--  if test "$host_cpu" = ia64; then
--    # AIX 5 supports IA64
--    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
--    shlibpath_var=LD_LIBRARY_PATH
--  else
--    # With GCC up to 2.95.x, collect2 would create an import file
--    # for dependence libraries.  The import file would start with
--    # the line `#! .'.  This would cause the generated library to
--    # depend on `.', always an invalid library.  This was fixed in
--    # development snapshots of GCC prior to 3.0.
--    case $host_os in
--      aix4 | aix4.[01] | aix4.[01].*)
--      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	   echo ' yes '
--	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
--	:
--      else
--	can_build_shared=no
--      fi
--      ;;
--    esac
--    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
--    # soname into executable. Probably we can add versioning support to
--    # collect2, so additional links can be useful in future.
--    if test "$aix_use_runtimelinking" = yes; then
--      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
--      # instead of lib<name>.a to let people know that these are not
--      # typical AIX shared libraries.
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    else
--      # We preserve .a as extension for shared libraries through AIX4.2
--      # and later when we are not doing run time linking.
--      library_names_spec='${libname}${release}.a $libname.a'
--      soname_spec='${libname}${release}${shared_ext}$major'
--    fi
--    shlibpath_var=LIBPATH
--  fi
--  ;;
--
--amigaos*)
--  library_names_spec='$libname.ixlibrary $libname.a'
--  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -19729,7 +21877,7 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
--  ;;
--
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
--
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+@@ -19738,7 +21886,7 @@
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
 -bsdi4*)
--  version_type=linux
--  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 $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
--  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
--  # the default ld.so.conf also contains /usr/contrib/lib and
--  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
--  # libtool to hard-code these into programs
--  ;;
--
--cygwin* | mingw* | pw32*)
--  version_type=windows
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -19754,7 +21902,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
 -  shrext=".dll"
--  need_version=no
--  need_lib_prefix=no
--
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
--    library_names_spec='$libname.dll.a'
--    # DLL is installed to $(libdir)/../bin by postinstall_cmds
--    postinstall_cmds='base_file=`basename \${file}`~
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
--      dldir=$destdir/`dirname \$dlpath`~
--      test -d \$dldir || mkdir -p \$dldir~
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -19766,7 +21914,8 @@
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
 -      $install_prog $dir/$dlname \$dldir/$dlname'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
--      dlpath=$dir/\$dldll~
--       $rm \$dlpath'
--    shlibpath_overrides_runpath=yes
--
--    case $host_os in
--    cygwin*)
--      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
--      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
--      ;;
--    mingw*)
--      # MinGW DLLs use traditional 'lib' prefix
--      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
--        # It is most probably a Windows format PATH printed by
--        # mingw gcc, but we are running on Cygwin. Gcc prints its search
--        # path with ; separators, and with drive letters. We can handle the
--        # drive letters (cygwin fileutils understands them), so leave them,
--        # especially as we might pass files found there to a mingw objdump,
--        # which wouldn't understand a cygwinified path. Ahh.
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
--      else
--        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
--      fi
--      ;;
--    pw32*)
--      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+@@ -19796,7 +21945,7 @@
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
 -      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
--      ;;
--    esac
--    ;;
--
--  *)
--    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
--    ;;
--  esac
--  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=PATH
--  ;;
--
--darwin* | rhapsody*)
--  dynamic_linker="$host_os dyld"
--  version_type=darwin
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
--  soname_spec='${libname}${release}${major}$shared_ext'
--  shlibpath_overrides_runpath=yes
--  shlibpath_var=DYLD_LIBRARY_PATH
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+@@ -19819,7 +21968,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
--  # 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"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
--
--dgux*)
--  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
--  ;;
--
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -19842,20 +21991,17 @@
+   dynamic_linker=no
+   ;;
+ 
 -kfreebsd*-gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -23929,132 +23867,95 @@
 -
 -freebsd*)
 -  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
--      need_version=yes
--      ;;
--  esac
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[123]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -19873,14 +22019,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
 -  freebsd3.01* | freebsdelf3.01*)
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
++  freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
 -  *) # from 3.2 on
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
--    ;;
--  esac
--  ;;
--
--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
--  hardcode_into_libs=yes
--  ;;
--
--hpux9* | hpux10* | hpux11*)
--  # Give a soname corresponding to the major version so that dld.sl refuses to
--  # link against other versions.
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
++  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
++  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -19900,9 +22051,9 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
 -  case "$host_cpu" in
--  ia64*)
++  case $host_cpu in
+   ia64*)
 -    shrext='.so'
--    hardcode_into_libs=yes
--    dynamic_linker="$host_os dld.so"
--    shlibpath_var=LD_LIBRARY_PATH
--    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    if test "X$HPUX_IA64_MODE" = X32; then
--      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
--    else
--      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
--    fi
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--    ;;
--   hppa*64*)
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -19917,7 +22068,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
 -     shrext='.sl'
--     hardcode_into_libs=yes
--     dynamic_linker="$host_os dld.sl"
--     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
--     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--     soname_spec='${libname}${release}${shared_ext}$major'
--     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
--     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--     ;;
--   *)
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -19928,7 +22079,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
 -    shrext='.sl'
--    dynamic_linker="$host_os dld.sl"
--    shlibpath_var=SHLIB_PATH
--    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    ;;
--  esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
--  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
--  ;;
--
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -19940,6 +22091,18 @@
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++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 ;;
+@@ -19982,1065 +22145,265 @@
+   dynamic_linker=no
+   ;;
+ 
 -# This must be Linux ELF.
 -linux*)
 -  version_type=linux
@@ -24588,57 +24489,20 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
-+      if test "$GCC" = yes; then
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag_GCJ='${wl}-z,text'
-+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-+      archive_cmds_need_lc_GCJ=no
-+      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator_GCJ=':'
-+      link_all_deplibs_GCJ=yes
-+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+      if test "$GCC" = yes; then
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
+-
 -#undef dlopen
-+    uts4*)
-+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -24658,12 +24522,7 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+    *)
-+      ld_shlibs_GCJ=no
-+      ;;
-+    esac
-+  fi
- 
+-
 -int
 -main ()
 -{
@@ -24698,10 +24557,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-+test "$ld_shlibs_GCJ" = no && can_build_shared=no
- 
+-
 -ac_cv_func_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -24725,14 +24581,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_GCJ" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc_GCJ=yes
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -24761,70 +24610,20 @@
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds_GCJ in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # 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; }
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&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
-+  (exit $ac_status); } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_GCJ
-+	pic_flag=$lt_prog_compiler_pic_GCJ
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-+        allow_undefined_flag_GCJ=
-+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_dl_dlopen=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  (exit $ac_status); }
-+        then
-+	  archive_cmds_need_lc_GCJ=no
-+        else
-+	  archive_cmds_need_lc_GCJ=yes
-+        fi
-+        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+      else
-+        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; }
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
- 
+-
 -ac_cv_lib_dl_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -24840,33 +24639,7 @@
 -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
-+{ 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=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
- else
+-else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lsvld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -24875,11 +24648,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -24921,20 +24690,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
- 
+-
 -ac_cv_lib_svld_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -24959,50 +24715,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
- 
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
@@ -25044,12 +24757,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
- 
+-
 -ac_cv_lib_dld_dld_link=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -25061,228 +24769,84 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
- 
-+bsdi[45]*)
-+  version_type=linux
-+  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 $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
- 
+-
+-
 -fi
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
- 
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
- 
+-
+-
 -fi
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
- 
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
- 
+-
+-
 -fi
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
- 
-+dgux*)
+-
+-
+-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'
++  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
  
--fi
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
- 
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[123]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
++  # 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
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  freebsd3.[01]* | freebsdelf3.[01]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd*) # from 4.6 on
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
  
 -fi
-+gnu*)
++  # 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'
++  ;;
+ 
+-    ;;
+-  esac
++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}'
++  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'
 +  ;;
  
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
++netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  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
+-    enable_dlopen=no
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+   hppa*64*)
-+     shrext_cmds='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-   esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
++    dynamic_linker='NetBSD ld.elf_so'
+   fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
 +  ;;
  
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
--
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
@@ -25305,62 +24869,15 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20848 "configure"
+-#line 20845 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+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
-+  ;;
- 
+-
 -#include <stdio.h>
-+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
-+  ;;
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -25370,11 +24887,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
- 
+-
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -25396,42 +24909,21 @@
 -#    endif
 -#  endif
 -#endif
-+# 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
- 
+-
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+  # 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
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # 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'
++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
 +  ;;
  
 -  if (self)
@@ -25440,16 +24932,14 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+netbsdelf*-gnu)
++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}'
++  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'
++  shlibpath_overrides_runpath=yes
 +  ;;
  
 -    exit (status);
@@ -25470,37 +24960,38 @@
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
-+netbsd*)
++openbsd*)
 +  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
 +  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'
++  # 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
++  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
-+    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'
++    shlibpath_overrides_runpath=yes
    fi
 -fi
 -rm -fr conftest*
 -
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
+-
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+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
-+  ;;
- 
+-
 -    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
@@ -25514,45 +25005,12 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20946 "configure"
+-#line 20943 "configure"
 -#include "confdefs.h"
-+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
-+  ;;
- 
+-
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+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
-+  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
 +  ;;
  
 -#include <stdio.h>
@@ -25719,14 +25177,14 @@
 -rm -fr conftest*
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
-+
+ 
 +*)
 +  dynamic_linker=no
 +  ;;
@@ -25794,7 +25252,7 @@
  fi
  
  
-@@ -21060,7 +22419,8 @@
+@@ -21057,7 +22420,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.
@@ -25804,7 +25262,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 \
-@@ -21160,6 +22520,12 @@
+@@ -21157,6 +22521,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -25817,7 +25275,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21171,6 +22537,9 @@
+@@ -21168,6 +22538,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -25827,7 +25285,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21190,7 +22559,7 @@
+@@ -21187,7 +22560,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -25836,7 +25294,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21221,7 +22590,7 @@
+@@ -21218,7 +22591,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -25845,7 +25303,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21236,7 +22605,7 @@
+@@ -21233,7 +22606,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -25854,7 +25312,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21438,7 +22807,10 @@
+@@ -21435,7 +22808,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.
@@ -25866,7 +25324,7 @@
  fi
  
  
-@@ -21458,7 +22830,6 @@
+@@ -21455,7 +22831,6 @@
        RC)
  
  
@@ -25874,7 +25332,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21477,15 +22848,42 @@
+@@ -21474,15 +22849,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -25917,7 +25375,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21501,7 +22899,8 @@
+@@ -21498,7 +22900,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.
@@ -25927,7 +25385,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 \
-@@ -21601,6 +23000,12 @@
+@@ -21598,6 +23001,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -25940,7 +25398,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21612,6 +23017,9 @@
+@@ -21609,6 +23018,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -25950,7 +25408,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21631,7 +23039,7 @@
+@@ -21628,7 +23040,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -25959,7 +25417,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21662,7 +23070,7 @@
+@@ -21659,7 +23071,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -25968,7 +25426,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21677,7 +23085,7 @@
+@@ -21674,7 +23086,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -25977,7 +25435,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21879,7 +23287,10 @@
+@@ -21876,7 +23288,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.
@@ -25989,7 +25447,7 @@
  fi
  
  
-@@ -21926,7 +23337,7 @@
+@@ -21923,7 +23338,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -25998,7 +25456,7 @@
  
  # Prevent multiple expansion
  
-@@ -21981,8 +23392,8 @@
+@@ -21978,8 +23393,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -26009,7 +25467,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22008,17 +23419,17 @@
+@@ -22005,17 +23420,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -26033,7 +25491,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22033,32 +23444,33 @@
+@@ -22030,32 +23445,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26075,7 +25533,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22067,8 +23479,8 @@
+@@ -22064,8 +23480,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -26086,7 +25544,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22094,11 +23506,11 @@
+@@ -22091,11 +23507,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -26102,7 +25560,7 @@
  fi
  
  
-@@ -22106,8 +23518,8 @@
+@@ -22103,8 +23519,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -26113,7 +25571,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22201,8 +23613,7 @@
+@@ -22198,8 +23614,7 @@
  
  
  
@@ -26123,7 +25581,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22214,8 +23625,8 @@
+@@ -22211,8 +23626,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -26134,7 +25592,7 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22243,24 +23654,36 @@
+@@ -22240,24 +23655,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26179,7 +25637,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22269,15 +23692,16 @@
+@@ -22266,15 +23693,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26200,7 +25658,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22306,15 +23730,14 @@
+@@ -22303,15 +23731,14 @@
  
  
  
@@ -26219,7 +25677,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22326,9 +23749,6 @@
+@@ -22323,9 +23750,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26229,7 +25687,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22354,24 +23774,36 @@
+@@ -22351,24 +23775,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26274,7 +25732,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22380,9 +23812,10 @@
+@@ -22377,9 +23813,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26287,7 +25745,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22395,11 +23828,11 @@
+@@ -22392,11 +23829,11 @@
  fi
  
  
@@ -26303,7 +25761,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22420,8 +23853,7 @@
+@@ -22417,8 +23854,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -26313,7 +25771,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22459,24 +23891,36 @@
+@@ -22456,24 +23892,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26358,7 +25816,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22486,10 +23930,11 @@
+@@ -22483,10 +23931,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26368,11 +25826,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22502,8 +23947,8 @@
+@@ -22499,8 +23948,8 @@
  
  fi
  
@@ -26383,7 +25841,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22527,15 +23972,14 @@
+@@ -22524,15 +23973,14 @@
  
  
  
@@ -26402,7 +25860,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22547,9 +23991,6 @@
+@@ -22544,9 +23992,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26412,7 +25870,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22574,24 +24015,36 @@
+@@ -22571,24 +24016,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26457,7 +25915,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22600,9 +24053,10 @@
+@@ -22597,9 +24054,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26470,7 +25928,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22615,11 +24069,11 @@
+@@ -22612,11 +24070,11 @@
  fi
  
  
@@ -26486,7 +25944,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22640,8 +24094,7 @@
+@@ -22637,8 +24095,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -26496,7 +25954,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22678,24 +24131,36 @@
+@@ -22675,24 +24132,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26541,7 +25999,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22705,10 +24170,11 @@
+@@ -22702,10 +24171,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26551,11 +26009,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22721,8 +24187,8 @@
+@@ -22718,8 +24188,8 @@
  
  fi
  
@@ -26566,7 +26024,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22745,8 +24211,8 @@
+@@ -22742,8 +24212,8 @@
  
  
  
@@ -26577,7 +26035,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22763,30 +24229,42 @@
+@@ -22760,30 +24230,42 @@
  int
  main ()
  {
@@ -26629,7 +26087,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22795,20 +24273,21 @@
+@@ -22792,20 +24274,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26638,7 +26096,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26657,7 +26115,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22825,30 +24304,42 @@
+@@ -22822,30 +24305,42 @@
  int
  main ()
  {
@@ -26709,7 +26167,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22857,21 +24348,22 @@
+@@ -22854,21 +24349,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26718,7 +26176,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26738,7 +26196,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22884,40 +24376,52 @@
+@@ -22881,40 +24377,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26803,7 +26261,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22926,19 +24430,20 @@
+@@ -22923,19 +24431,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26812,7 +26270,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26830,7 +26288,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22951,40 +24456,52 @@
+@@ -22948,40 +24457,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26895,7 +26353,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22993,14 +24510,15 @@
+@@ -22990,14 +24511,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26904,7 +26362,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -26915,7 +26373,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -23026,13 +24544,13 @@
+@@ -23023,13 +24545,13 @@
  
     fi
  
@@ -26932,7 +26390,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23061,24 +24579,36 @@
+@@ -23058,24 +24580,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26977,7 +26435,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23090,8 +24620,10 @@
+@@ -23087,8 +24621,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26989,7 +26447,7 @@
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23101,17 +24633,17 @@
+@@ -23098,17 +24634,17 @@
  
  fi
  
@@ -27012,7 +26470,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23140,24 +24672,36 @@
+@@ -23137,24 +24673,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27057,7 +26515,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23169,8 +24713,10 @@
+@@ -23166,8 +24714,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27069,7 +26527,7 @@
           done
           ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23181,8 +24727,8 @@
+@@ -23178,8 +24728,8 @@
  
  fi
  
@@ -27080,7 +26538,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23195,8 +24741,8 @@
+@@ -23192,8 +24742,8 @@
  _ACEOF
  
  
@@ -27091,7 +26549,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23209,40 +24755,52 @@
+@@ -23206,40 +24756,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27156,7 +26614,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23251,21 +24809,22 @@
+@@ -23248,21 +24810,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27165,7 +26623,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -27185,7 +26643,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23278,40 +24837,52 @@
+@@ -23275,40 +24838,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27250,7 +26708,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23320,21 +24891,22 @@
+@@ -23317,21 +24892,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27259,7 +26717,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -27279,7 +26737,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23361,53 +24933,59 @@
+@@ -23358,53 +24934,59 @@
  
  #undef inet_ntoa
  
@@ -27358,7 +26816,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23416,17 +24994,18 @@
+@@ -23413,17 +24995,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27367,7 +26825,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -27383,7 +26841,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23439,40 +25018,52 @@
+@@ -23436,40 +25019,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27448,7 +26906,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23481,21 +25072,22 @@
+@@ -23478,21 +25073,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27457,7 +26915,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -27477,7 +26935,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23522,53 +25114,59 @@
+@@ -23519,53 +25115,59 @@
  
  #undef connect
  
@@ -27556,7 +27014,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23577,17 +25175,18 @@
+@@ -23574,17 +25176,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27565,7 +27023,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -27581,7 +27039,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23600,40 +25199,52 @@
+@@ -23597,40 +25200,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27646,7 +27104,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23642,22 +25253,23 @@
+@@ -23639,22 +25254,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27655,7 +27113,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -27676,7 +27134,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23684,53 +25296,59 @@
+@@ -23681,53 +25297,59 @@
  
  #undef remove
  
@@ -27755,7 +27213,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23739,17 +25357,18 @@
+@@ -23736,17 +25358,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27764,7 +27222,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -27780,7 +27238,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23762,40 +25381,52 @@
+@@ -23759,40 +25382,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27845,7 +27303,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23804,14 +25435,15 @@
+@@ -23801,14 +25436,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27854,7 +27312,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -27865,7 +27323,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23819,8 +25451,8 @@
+@@ -23816,8 +25452,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -27876,7 +27334,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23847,53 +25479,59 @@
+@@ -23844,53 +25480,59 @@
  
  #undef shmat
  
@@ -27955,7 +27413,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23902,18 +25540,19 @@
+@@ -23899,18 +25541,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27964,7 +27422,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -27981,7 +27439,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23926,40 +25565,52 @@
+@@ -23923,40 +25566,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28046,7 +27504,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23968,14 +25619,15 @@
+@@ -23965,14 +25620,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28055,7 +27513,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -28066,7 +27524,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23989,18 +25641,19 @@
+@@ -23986,18 +25642,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28094,7 +27552,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24011,24 +25664,36 @@
+@@ -24008,24 +25665,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28139,7 +27597,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24037,15 +25702,16 @@
+@@ -24034,15 +25703,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28162,7 +27620,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24054,8 +25720,13 @@
+@@ -24051,8 +25721,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28178,7 +27636,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24079,9 +25750,10 @@
+@@ -24076,9 +25751,10 @@
  
    ac_header_preproc=no
  fi
@@ -28191,7 +27649,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24105,25 +25777,19 @@
+@@ -24102,25 +25778,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;}
@@ -28224,7 +27682,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24141,18 +25807,19 @@
+@@ -24138,18 +25808,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28252,7 +27710,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24163,24 +25830,36 @@
+@@ -24160,24 +25831,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28297,7 +27755,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24189,15 +25868,16 @@
+@@ -24186,15 +25869,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28320,7 +27778,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24206,8 +25886,13 @@
+@@ -24203,8 +25887,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28336,7 +27794,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24231,9 +25916,10 @@
+@@ -24228,9 +25917,10 @@
  
    ac_header_preproc=no
  fi
@@ -28349,7 +27807,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24257,25 +25943,19 @@
+@@ -24254,25 +25944,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;}
@@ -28382,7 +27840,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24289,8 +25969,8 @@
+@@ -24286,8 +25970,8 @@
  
  
     # darwin requires a poll emulation library
@@ -28393,7 +27851,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24303,40 +25983,52 @@
+@@ -24300,40 +25984,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28458,7 +27916,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24345,14 +26037,15 @@
+@@ -24342,14 +26038,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28467,7 +27925,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -28478,7 +27936,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24363,18 +26056,19 @@
+@@ -24360,18 +26057,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28506,7 +27964,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24385,24 +26079,36 @@
+@@ -24382,24 +26080,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28551,7 +28009,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24411,15 +26117,16 @@
+@@ -24408,15 +26118,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28574,7 +28032,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24428,8 +26135,13 @@
+@@ -24425,8 +26136,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28590,7 +28048,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24453,9 +26165,10 @@
+@@ -24450,9 +26166,10 @@
  
    ac_header_preproc=no
  fi
@@ -28603,7 +28061,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24479,25 +26192,19 @@
+@@ -24476,25 +26193,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;}
@@ -28636,7 +28094,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24512,17 +26219,17 @@
+@@ -24509,17 +26220,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -28660,7 +28118,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24533,24 +26240,36 @@
+@@ -24530,24 +26241,36 @@
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28705,7 +28163,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24559,15 +26278,16 @@
+@@ -24556,15 +26279,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28728,7 +28186,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24576,8 +26296,13 @@
+@@ -24573,8 +26297,13 @@
  /* end confdefs.h.  */
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
@@ -28744,7 +28202,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24601,9 +26326,10 @@
+@@ -24598,9 +26327,10 @@
  
    ac_header_preproc=no
  fi
@@ -28757,7 +28215,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24627,25 +26353,18 @@
+@@ -24624,25 +26354,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;}
@@ -28788,7 +28246,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24662,8 +26381,8 @@
+@@ -24659,8 +26382,8 @@
  
  
  
@@ -28799,7 +28257,7 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24689,31 +26408,43 @@
+@@ -24686,31 +26409,43 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28853,7 +28311,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24724,25 +26455,25 @@
+@@ -24721,25 +26456,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28865,7 +28323,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$kde_libs_safe
  
@@ -28886,7 +28344,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24754,9 +26485,6 @@
+@@ -24751,9 +26486,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28896,7 +28354,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24782,24 +26510,36 @@
+@@ -24779,24 +26511,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28941,7 +28399,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24808,9 +26548,10 @@
+@@ -24805,9 +26549,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28954,7 +28412,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -24823,11 +26564,11 @@
+@@ -24820,11 +26565,11 @@
  fi
  
  
@@ -28970,7 +28428,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24848,8 +26589,7 @@
+@@ -24845,8 +26590,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -28980,7 +28438,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24887,24 +26627,36 @@
+@@ -24884,24 +26628,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29025,7 +28483,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24914,10 +26666,11 @@
+@@ -24911,10 +26667,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29035,11 +28493,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -24930,8 +26683,8 @@
+@@ -24927,8 +26684,8 @@
  
  fi
  
@@ -29050,7 +28508,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24958,8 +26711,8 @@
+@@ -24955,8 +26712,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -29061,7 +28519,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24972,40 +26725,52 @@
+@@ -24969,40 +26726,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29126,7 +28584,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25014,27 +26779,28 @@
+@@ -25011,27 +26780,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29135,7 +28593,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -29165,7 +28623,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25047,40 +26813,52 @@
+@@ -25044,40 +26814,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29230,7 +28688,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25089,22 +26867,23 @@
+@@ -25086,22 +26868,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29239,7 +28697,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -29260,7 +28718,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25115,36 +26894,49 @@
+@@ -25112,36 +26895,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29320,7 +28778,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25153,20 +26945,21 @@
+@@ -25150,23 +26946,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29338,22 +28796,29 @@
  
 -echo "$as_me:$LINENO: checking size of int" >&5
 -echo $ECHO_N "checking size of int... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of 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
+-  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.
-@@ -25179,10 +26972,11 @@
+-  # 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.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25176,10 +26972,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29362,7 +28827,7 @@
  test_array [0] = 0
  
    ;
-@@ -25190,24 +26984,36 @@
+@@ -25187,24 +26985,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29407,11 +28872,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25220,10 +27026,11 @@
+@@ -25217,10 +27027,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29420,7 +28886,7 @@
  test_array [0] = 0
  
    ;
-@@ -25231,24 +27038,36 @@
+@@ -25228,24 +27040,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29465,7 +28931,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25257,30 +27076,32 @@
+@@ -25254,30 +27078,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29498,7 +28964,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29507,7 +28974,7 @@
  test_array [0] = 0
  
    ;
-@@ -25288,24 +27109,36 @@
+@@ -25285,24 +27112,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29552,11 +29019,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25318,10 +27151,11 @@
+@@ -25315,10 +27154,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29565,7 +29033,7 @@
  test_array [0] = 0
  
    ;
-@@ -25329,24 +27163,36 @@
+@@ -25326,24 +27167,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29610,7 +29078,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25355,24 +27201,27 @@
+@@ -25352,24 +27205,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29648,11 +29116,12 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25383,10 +27232,11 @@
+@@ -25380,10 +27236,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29661,7 +29130,7 @@
  test_array [0] = 0
  
    ;
-@@ -25394,24 +27244,36 @@
+@@ -25391,24 +27249,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29706,7 +29175,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25420,26 +27282,20 @@
+@@ -25417,25 +27287,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29720,38 +29189,43 @@
  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
+-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;}
+-See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
- esac
- else
+-esac
+-else
 -  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
++'') if test "$ac_cv_type_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ 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: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
--else
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_int=0
++	       fi ;;
++esac
+ else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
- _ACEOF
-@@ -25447,8 +27303,9 @@
+@@ -25444,8 +27312,10 @@
  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_;
++	        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
-@@ -25457,35 +27314,44 @@
+@@ -25454,35 +27324,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29809,12 +29283,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25496,28 +27362,27 @@
+@@ -25493,28 +27372,31 @@
  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)
++if test "$ac_cv_type_int" = yes; then
++	         { { 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)
@@ -29823,18 +29298,24 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_int=0
++	       fi
  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_int=0
+-else
+-  ac_cv_sizeof_int=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
@@ -29846,7 +29327,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25528,36 +27393,49 @@
+@@ -25525,36 +27407,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29906,7 +29387,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25566,20 +27444,21 @@
+@@ -25563,23 +27458,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29924,22 +29405,29 @@
  
 -echo "$as_me:$LINENO: checking size of short" >&5
 -echo $ECHO_N "checking size of short... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of 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
+-  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.
-@@ -25592,10 +27471,11 @@
+-  # 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.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25589,10 +27484,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29948,7 +29436,7 @@
  test_array [0] = 0
  
    ;
-@@ -25603,24 +27483,36 @@
+@@ -25600,24 +27497,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29993,11 +29481,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25633,10 +27525,11 @@
+@@ -25630,10 +27539,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30006,7 +29495,7 @@
  test_array [0] = 0
  
    ;
-@@ -25644,24 +27537,36 @@
+@@ -25641,24 +27552,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30051,7 +29540,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25670,30 +27575,32 @@
+@@ -25667,30 +27590,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30084,7 +29573,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30093,7 +29583,7 @@
  test_array [0] = 0
  
    ;
-@@ -25701,24 +27608,36 @@
+@@ -25698,24 +27624,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30138,11 +29628,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25731,10 +27650,11 @@
+@@ -25728,10 +27666,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30151,7 +29642,7 @@
  test_array [0] = 0
  
    ;
-@@ -25742,24 +27662,36 @@
+@@ -25739,24 +27679,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30196,7 +29687,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25768,24 +27700,27 @@
+@@ -25765,24 +27717,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30234,11 +29725,12 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25796,10 +27731,11 @@
+@@ -25793,10 +27748,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30247,7 +29739,7 @@
  test_array [0] = 0
  
    ;
-@@ -25807,24 +27743,36 @@
+@@ -25804,24 +27761,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30292,7 +29784,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25833,26 +27781,20 @@
+@@ -25830,26 +27799,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30306,13 +29798,17 @@
  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)
++'') if test "$ac_cv_type_short" = yes; then
++	         { { 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; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_short=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -30325,19 +29821,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25860,8 +27802,9 @@
+@@ -25857,8 +27824,10 @@
  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_;
++	        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
-@@ -25870,35 +27813,44 @@
+@@ -25867,35 +27836,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30395,12 +29892,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25909,28 +27861,27 @@
+@@ -25906,28 +27884,31 @@
  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)
++if test "$ac_cv_type_short" = yes; then
++	         { { 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)
@@ -30409,18 +29907,24 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_short=0
++	       fi
  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_short=0
+-else
+-  ac_cv_sizeof_short=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
@@ -30432,7 +29936,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25941,36 +27892,49 @@
+@@ -25938,36 +27919,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30492,7 +29996,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25979,20 +27943,21 @@
+@@ -25976,23 +27970,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30510,22 +30014,29 @@
  
 -echo "$as_me:$LINENO: checking size of long" >&5
 -echo $ECHO_N "checking size of long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of long" >&5
 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$ac_cv_type_long" = yes; then
+-  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.
-@@ -26005,10 +27970,11 @@
+-  # 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.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26002,10 +27996,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30534,7 +30045,7 @@
  test_array [0] = 0
  
    ;
-@@ -26016,24 +27982,36 @@
+@@ -26013,24 +28009,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30579,11 +30090,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26046,10 +28024,11 @@
+@@ -26043,10 +28051,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30592,7 +30104,7 @@
  test_array [0] = 0
  
    ;
-@@ -26057,24 +28036,36 @@
+@@ -26054,24 +28064,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30637,7 +30149,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26083,30 +28074,32 @@
+@@ -26080,30 +28102,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30670,7 +30182,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30679,7 +30192,7 @@
  test_array [0] = 0
  
    ;
-@@ -26114,24 +28107,36 @@
+@@ -26111,24 +28136,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30724,11 +30237,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26144,10 +28149,11 @@
+@@ -26141,10 +28178,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30737,7 +30251,7 @@
  test_array [0] = 0
  
    ;
-@@ -26155,24 +28161,36 @@
+@@ -26152,24 +28191,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30782,7 +30296,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26181,24 +28199,27 @@
+@@ -26178,24 +28229,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30820,11 +30334,12 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26209,10 +28230,11 @@
+@@ -26206,10 +28260,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30833,7 +30348,7 @@
  test_array [0] = 0
  
    ;
-@@ -26220,24 +28242,36 @@
+@@ -26217,24 +28273,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30878,7 +30393,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26246,26 +28280,20 @@
+@@ -26243,26 +28311,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30892,13 +30407,17 @@
  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)
++'') if test "$ac_cv_type_long" = yes; then
++	         { { 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; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -30911,19 +30430,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26273,8 +28301,9 @@
+@@ -26270,8 +28336,10 @@
  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_;
++	        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
-@@ -26283,35 +28312,44 @@
+@@ -26280,35 +28348,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30981,12 +30501,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26322,28 +28360,27 @@
+@@ -26319,28 +28396,31 @@
  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)
++if test "$ac_cv_type_long" = yes; then
++	         { { 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)
@@ -30995,18 +30516,24 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long=0
++	       fi
  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_long=0
+-else
+-  ac_cv_sizeof_long=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
@@ -31018,7 +30545,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26354,36 +28391,49 @@
+@@ -26351,36 +28431,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31078,7 +30605,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26392,20 +28442,21 @@
+@@ -26389,23 +28482,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31096,22 +30623,29 @@
  
 -echo "$as_me:$LINENO: checking size of char *" >&5
 -echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of 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
+-  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.
-@@ -26418,10 +28469,11 @@
+-  # 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.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26415,10 +28508,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31120,7 +30654,7 @@
  test_array [0] = 0
  
    ;
-@@ -26429,24 +28481,36 @@
+@@ -26426,24 +28521,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31165,11 +30699,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26459,10 +28523,11 @@
+@@ -26456,10 +28563,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31178,7 +30713,7 @@
  test_array [0] = 0
  
    ;
-@@ -26470,24 +28535,36 @@
+@@ -26467,24 +28576,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31223,7 +30758,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26496,30 +28573,32 @@
+@@ -26493,30 +28614,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31256,7 +30791,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31265,7 +30801,7 @@
  test_array [0] = 0
  
    ;
-@@ -26527,24 +28606,36 @@
+@@ -26524,24 +28648,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31310,11 +30846,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26557,10 +28648,11 @@
+@@ -26554,10 +28690,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31323,7 +30860,7 @@
  test_array [0] = 0
  
    ;
-@@ -26568,24 +28660,36 @@
+@@ -26565,24 +28703,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31368,7 +30905,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26594,24 +28698,27 @@
+@@ -26591,24 +28741,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31406,11 +30943,12 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26622,10 +28729,11 @@
+@@ -26619,10 +28772,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31419,7 +30957,7 @@
  test_array [0] = 0
  
    ;
-@@ -26633,24 +28741,36 @@
+@@ -26630,24 +28785,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31464,7 +31002,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26659,26 +28779,20 @@
+@@ -26656,26 +28823,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31478,13 +31016,17 @@
  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 *)
++'') if test "$ac_cv_type_char_p" = yes; then
++	         { { 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; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_char_p=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -31497,19 +31039,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26686,8 +28800,9 @@
+@@ -26683,8 +28848,10 @@
  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_;
++	        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
-@@ -26696,35 +28811,44 @@
+@@ -26693,35 +28860,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31567,12 +31110,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26735,30 +28859,29 @@
+@@ -26732,30 +28908,33 @@
  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 *)
++if test "$ac_cv_type_char_p" = yes; then
++	         { { 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 *)
@@ -31581,18 +31125,24 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_char_p=0
++	       fi
  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_char_p=0
+-else
+-  ac_cv_sizeof_char_p=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
  _ACEOF
@@ -31606,7 +31156,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26771,40 +28894,52 @@
+@@ -26768,40 +28947,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -31671,7 +31221,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26813,14 +28948,15 @@
+@@ -26810,14 +29001,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31680,7 +31230,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -31691,7 +31241,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26829,8 +28965,8 @@
+@@ -26826,8 +29018,8 @@
  fi
  
  
@@ -31702,7 +31252,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26843,40 +28979,52 @@
+@@ -26840,40 +29032,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -31767,7 +31317,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26885,14 +29033,15 @@
+@@ -26882,14 +29086,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31776,7 +31326,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -31787,7 +31337,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26906,8 +29055,8 @@
+@@ -26903,8 +29108,8 @@
  
  
  
@@ -31798,7 +31348,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26918,36 +29067,49 @@
+@@ -26915,36 +29120,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31858,7 +31408,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26956,20 +29118,21 @@
+@@ -26953,23 +29171,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31876,22 +31426,29 @@
  
 -echo "$as_me:$LINENO: checking size of size_t" >&5
 -echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of 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
+-  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.
-@@ -26982,10 +29145,11 @@
+-  # 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.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26979,10 +29197,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31900,7 +31457,7 @@
  test_array [0] = 0
  
    ;
-@@ -26993,24 +29157,36 @@
+@@ -26990,24 +29210,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31945,11 +31502,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27023,10 +29199,11 @@
+@@ -27020,10 +29252,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -31958,7 +31516,7 @@
  test_array [0] = 0
  
    ;
-@@ -27034,24 +29211,36 @@
+@@ -27031,24 +29265,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32003,7 +31561,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27060,30 +29249,32 @@
+@@ -27057,30 +29303,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32036,7 +31594,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32045,7 +31604,7 @@
  test_array [0] = 0
  
    ;
-@@ -27091,24 +29282,36 @@
+@@ -27088,24 +29337,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32090,11 +31649,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27121,10 +29324,11 @@
+@@ -27118,10 +29379,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32103,7 +31663,7 @@
  test_array [0] = 0
  
    ;
-@@ -27132,24 +29336,36 @@
+@@ -27129,24 +29392,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32148,7 +31708,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27158,24 +29374,27 @@
+@@ -27155,24 +29430,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32186,11 +31746,12 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27186,10 +29405,11 @@
+@@ -27183,10 +29461,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32199,7 +31760,7 @@
  test_array [0] = 0
  
    ;
-@@ -27197,24 +29417,36 @@
+@@ -27194,24 +29474,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32244,7 +31805,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27223,26 +29455,20 @@
+@@ -27220,26 +29512,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32258,13 +31819,17 @@
  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)
++'') if test "$ac_cv_type_size_t" = yes; then
++	         { { 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; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_size_t=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -32277,19 +31842,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27250,8 +29476,9 @@
+@@ -27247,8 +29537,10 @@
  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_;
++	        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
-@@ -27260,35 +29487,44 @@
+@@ -27257,35 +29549,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32347,12 +31913,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27299,29 +29535,28 @@
+@@ -27296,29 +29597,32 @@
  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)
++if test "$ac_cv_type_size_t" = yes; then
++	         { { 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)
@@ -32361,18 +31928,24 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_size_t=0
++	       fi
  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_size_t=0
+-else
+-  ac_cv_sizeof_size_t=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
  _ACEOF
@@ -32385,7 +31958,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27332,36 +29567,49 @@
+@@ -27329,36 +29633,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32445,7 +32018,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27370,20 +29618,21 @@
+@@ -27367,23 +29684,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32463,22 +32036,29 @@
  
 -echo "$as_me:$LINENO: checking size of unsigned long" >&5
 -echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
 +{ echo "$as_me:$LINENO: checking size of 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
+-  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.
-@@ -27396,10 +29645,11 @@
+-  # 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.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27393,10 +29710,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32487,7 +32067,7 @@
  test_array [0] = 0
  
    ;
-@@ -27407,24 +29657,36 @@
+@@ -27404,24 +29723,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32532,11 +32112,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27437,10 +29699,11 @@
+@@ -27434,10 +29765,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32545,7 +32126,7 @@
  test_array [0] = 0
  
    ;
-@@ -27448,24 +29711,36 @@
+@@ -27445,24 +29778,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32590,7 +32171,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27474,30 +29749,32 @@
+@@ -27471,30 +29816,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32623,7 +32204,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32632,7 +32214,7 @@
  test_array [0] = 0
  
    ;
-@@ -27505,24 +29782,36 @@
+@@ -27502,24 +29850,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32677,11 +32259,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27535,10 +29824,11 @@
+@@ -27532,10 +29892,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32690,7 +32273,7 @@
  test_array [0] = 0
  
    ;
-@@ -27546,24 +29836,36 @@
+@@ -27543,24 +29905,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32735,7 +32318,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27572,24 +29874,27 @@
+@@ -27569,24 +29943,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32773,11 +32356,12 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27600,10 +29905,11 @@
+@@ -27597,10 +29974,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -32786,7 +32370,7 @@
  test_array [0] = 0
  
    ;
-@@ -27611,24 +29917,36 @@
+@@ -27608,24 +29987,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32831,7 +32415,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27637,26 +29955,20 @@
+@@ -27634,26 +30025,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32845,13 +32429,17 @@
  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)
++'') if test "$ac_cv_type_unsigned_long" = yes; then
++	         { { 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; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_unsigned_long=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -32864,19 +32452,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27664,8 +29976,9 @@
+@@ -27661,8 +30050,10 @@
  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_;
++	        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
-@@ -27674,35 +29987,44 @@
+@@ -27671,35 +30062,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32934,12 +32523,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27713,30 +30035,29 @@
+@@ -27710,30 +30110,33 @@
  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)
++if test "$ac_cv_type_unsigned_long" = yes; then
++	         { { 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)
@@ -32948,18 +32538,24 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_unsigned_long=0
++	       fi
  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
+-else
+-  ac_cv_sizeof_unsigned_long=0
  fi
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
  _ACEOF
@@ -32973,7 +32569,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27757,36 +30078,48 @@
+@@ -27754,36 +30157,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33034,7 +32630,7 @@
        { { 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!
-@@ -27798,18 +30131,18 @@
+@@ -27795,18 +30210,18 @@
     { (exit 1); exit 1; }; }
  
  fi
@@ -33058,7 +32654,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27839,24 +30172,36 @@
+@@ -27836,24 +30251,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33103,7 +32699,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27865,9 +30210,10 @@
+@@ -27862,9 +30289,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33112,11 +32708,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
      CXXFLAGS=$safe_CXXFLAGS
-@@ -27880,26 +30226,26 @@
+@@ -27877,26 +30305,26 @@
  
  
  fi
@@ -33153,7 +32749,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27918,18 +30264,19 @@
+@@ -27915,18 +30343,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33181,7 +32777,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27940,24 +30287,36 @@
+@@ -27937,24 +30366,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33226,7 +32822,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27966,15 +30325,16 @@
+@@ -27963,15 +30404,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33249,7 +32845,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27983,8 +30343,13 @@
+@@ -27980,8 +30422,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -33265,7 +32861,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28008,9 +30373,10 @@
+@@ -28005,9 +30452,10 @@
  
    ac_header_preproc=no
  fi
@@ -33278,7 +32874,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -28034,25 +30400,19 @@
+@@ -28031,25 +30479,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;}
@@ -33311,7 +32907,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28064,8 +30424,8 @@
+@@ -28061,8 +30503,8 @@
  
  done
  
@@ -33322,7 +32918,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28092,53 +30452,59 @@
+@@ -28089,53 +30531,59 @@
  
  #undef _NSGetEnviron
  
@@ -33401,7 +32997,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28147,13 +30513,14 @@
+@@ -28144,13 +30592,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33410,7 +33006,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -33420,7 +33016,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28174,9 +30541,9 @@
+@@ -28171,9 +30620,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33433,7 +33029,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28202,53 +30569,59 @@
+@@ -28199,53 +30648,59 @@
  
  #undef $ac_func
  
@@ -33512,7 +33108,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28257,13 +30630,15 @@
+@@ -28254,13 +30709,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33521,7 +33117,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -33532,7 +33128,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28280,32 +30655,32 @@
+@@ -28277,32 +30734,32 @@
  
  
  
@@ -33577,7 +33173,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28321,8 +30696,8 @@
+@@ -28318,8 +30775,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -33588,7 +33184,7 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28359,8 +30734,13 @@
+@@ -28356,8 +30813,13 @@
  /* end confdefs.h.  */
  #include <$x_direct_test_include>
  _ACEOF
@@ -33604,7 +33200,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28427,6 +30807,7 @@
+@@ -28424,6 +30886,7 @@
      fi
    done
  fi
@@ -33612,7 +33208,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28456,24 +30837,36 @@
+@@ -28453,24 +30916,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33657,7 +33253,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28484,7 +30877,7 @@
+@@ -28481,7 +30956,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33666,17 +33262,17 @@
  # 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}/` \
-@@ -28532,7 +30925,8 @@
+@@ -28529,7 +31004,8 @@
    done
  done
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
  
-@@ -28542,21 +30936,26 @@
+@@ -28539,21 +31015,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -33711,7 +33307,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28564,7 +30963,7 @@
+@@ -28561,7 +31042,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
@@ -33720,7 +33316,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28573,7 +30972,7 @@
+@@ -28570,7 +31051,7 @@
      esac
    fi
    cd ..
@@ -33729,7 +33325,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28617,12 +31016,12 @@
+@@ -28614,12 +31095,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -33746,7 +33342,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28650,8 +31049,8 @@
+@@ -28647,8 +31128,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.
@@ -33757,7 +33353,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28664,40 +31063,52 @@
+@@ -28661,40 +31142,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33822,7 +33418,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28706,14 +31117,15 @@
+@@ -28703,14 +31196,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33831,7 +33427,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -33842,7 +33438,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28722,8 +31134,8 @@
+@@ -28719,8 +31213,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -33853,7 +33449,7 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28757,24 +31169,36 @@
+@@ -28754,24 +31248,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33898,7 +33494,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28783,10 +31207,11 @@
+@@ -28780,10 +31286,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33908,11 +33504,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  LDFLAGS=$kde_ldflags_safe
-@@ -28795,8 +31220,8 @@
+@@ -28792,8 +31299,8 @@
  fi
  
  
@@ -33923,7 +33519,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28858,8 +31283,8 @@
+@@ -28855,8 +31362,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33934,7 +33530,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28870,9 +31295,9 @@
+@@ -28867,9 +31374,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33947,7 +33543,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28884,40 +31309,52 @@
+@@ -28881,40 +31388,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34012,7 +33608,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28926,14 +31363,16 @@
+@@ -28923,14 +31442,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34021,7 +33617,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -34033,7 +33629,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28946,8 +31385,8 @@
+@@ -28943,8 +31464,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -34044,7 +33640,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28960,40 +31399,52 @@
+@@ -28957,40 +31478,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34109,7 +33705,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29002,14 +31453,15 @@
+@@ -28999,14 +31532,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34118,7 +33714,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -34129,7 +33725,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29017,8 +31469,8 @@
+@@ -29014,8 +31548,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -34140,7 +33736,7 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29037,40 +31489,53 @@
+@@ -29034,40 +31568,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34203,11 +33799,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
    fi
-@@ -29085,16 +31550,15 @@
+@@ -29082,16 +31629,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -34228,7 +33824,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29121,24 +31585,36 @@
+@@ -29118,24 +31664,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34273,7 +33869,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29147,8 +31623,10 @@
+@@ -29144,8 +31702,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34281,11 +33877,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29161,13 +31639,13 @@
+@@ -29158,13 +31718,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34303,7 +33899,7 @@
   :
  
  fi
-@@ -29179,16 +31657,15 @@
+@@ -29176,16 +31736,15 @@
      case $host_os in
   	solaris*)
  
@@ -34324,7 +33920,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29215,24 +31692,36 @@
+@@ -29212,24 +31771,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34369,7 +33965,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29241,8 +31730,10 @@
+@@ -29238,8 +31809,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34377,11 +33973,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29255,13 +31746,13 @@
+@@ -29252,13 +31825,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34399,7 +33995,7 @@
   :
  
  fi
-@@ -29288,17 +31779,17 @@
+@@ -29285,17 +31858,17 @@
  
  
  
@@ -34423,7 +34019,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29316,21 +31807,21 @@
+@@ -29313,21 +31886,21 @@
  fi
  
  
@@ -34453,7 +34049,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29349,14 +31840,14 @@
+@@ -29346,14 +31919,14 @@
  
  
  
@@ -34472,7 +34068,7 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29390,24 +31881,36 @@
+@@ -29387,24 +31960,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34517,7 +34113,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29416,9 +31919,10 @@
+@@ -29413,9 +31998,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34526,11 +34122,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29431,8 +31935,8 @@
+@@ -29428,8 +32014,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -34541,7 +34137,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29452,8 +31956,8 @@
+@@ -29449,8 +32035,8 @@
  
  
  
@@ -34552,7 +34148,7 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29489,24 +31993,36 @@
+@@ -29486,24 +32072,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34597,7 +34193,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29515,10 +32031,11 @@
+@@ -29512,10 +32110,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34607,11 +34203,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29532,19 +32049,19 @@
+@@ -29529,19 +32128,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -34637,7 +34233,7 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29577,24 +32094,36 @@
+@@ -29574,24 +32173,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34682,7 +34278,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29603,9 +32132,10 @@
+@@ -29600,9 +32211,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34691,11 +34287,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29615,14 +32145,14 @@
+@@ -29612,14 +32224,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -34716,7 +34312,7 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29655,24 +32185,36 @@
+@@ -29652,24 +32264,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34761,7 +34357,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29681,9 +32223,10 @@
+@@ -29678,9 +32302,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34770,11 +34366,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29693,11 +32236,11 @@
+@@ -29690,11 +32315,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34790,16 +34386,16 @@
  
         LIBJPEG=
  
-@@ -29717,7 +32260,7 @@
+@@ -29714,7 +32339,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29720: $i/$j" >&5
-+    echo "configure: 32263: $i/$j" >&5
+-    echo "configure: 29717: $i/$j" >&5
++    echo "configure: 32342: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29764,14 +32307,14 @@
+@@ -29761,14 +32386,14 @@
  
  
  
@@ -34817,7 +34413,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29814,8 +32357,8 @@
+@@ -29811,8 +32436,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34828,7 +34424,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29824,8 +32367,8 @@
+@@ -29821,8 +32446,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34839,7 +34435,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29839,10 +32382,9 @@
+@@ -29836,10 +32461,9 @@
  
  
  
@@ -34852,7 +34448,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29852,7 +32394,8 @@
+@@ -29849,7 +32473,8 @@
      fi
  
  
@@ -34862,7 +34458,7 @@
  
  USING_QT_MT=""
  
-@@ -29872,13 +32415,13 @@
+@@ -29869,13 +32494,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -34880,7 +34476,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29950,8 +32493,8 @@
+@@ -29947,8 +32572,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -34891,7 +34487,7 @@
  
  if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
  LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29960,34 +32503,34 @@
+@@ -29957,34 +32582,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -34938,16 +34534,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30015,7 +32558,7 @@
+@@ -30012,7 +32637,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 30018: $i/$j" >&5
-+    echo "configure: 32561: $i/$j" >&5
+-    echo "configure: 30015: $i/$j" >&5
++    echo "configure: 32640: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30052,8 +32595,7 @@
+@@ -30049,8 +32674,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -34957,7 +34553,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30190,13 +32732,13 @@
+@@ -30187,13 +32811,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -34975,7 +34571,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30205,15 +32747,14 @@
+@@ -30202,15 +32826,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -34994,7 +34590,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30334,12 +32875,12 @@
+@@ -30331,12 +32954,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -35011,7 +34607,7 @@
  
  fi
  
-@@ -30377,14 +32918,14 @@
+@@ -30374,14 +32997,14 @@
     fi
  
  
@@ -35029,7 +34625,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30427,8 +32968,8 @@
+@@ -30424,8 +33047,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35040,7 +34636,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30449,22 +32990,22 @@
+@@ -30446,22 +33069,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35068,7 +34664,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30507,12 +33048,12 @@
+@@ -30504,12 +33127,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35085,7 +34681,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30542,10 +33083,10 @@
+@@ -30539,10 +33162,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -35099,7 +34695,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30568,22 +33109,22 @@
+@@ -30565,22 +33188,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35129,7 +34725,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30606,13 +33147,13 @@
+@@ -30603,13 +33226,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35147,7 +34743,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30643,15 +33184,14 @@
+@@ -30640,15 +33263,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -35166,7 +34762,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30684,24 +33224,36 @@
+@@ -30681,24 +33303,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35211,7 +34807,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -30710,9 +33262,10 @@
+@@ -30707,9 +33341,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35220,11 +34816,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30728,12 +33281,12 @@
+@@ -30725,12 +33360,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -35241,7 +34837,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30764,15 +33317,15 @@
+@@ -30761,15 +33396,15 @@
  
  
  
@@ -35263,7 +34859,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30796,11 +33349,11 @@
+@@ -30793,11 +33428,11 @@
  
  
  
@@ -35279,34 +34875,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30852,7 +33405,7 @@
+@@ -30849,7 +33484,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30855: $i/$j" >&5
-+    echo "configure: 33408: $i/$j" >&5
+-    echo "configure: 30852: $i/$j" >&5
++    echo "configure: 33487: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30882,7 +33435,7 @@
+@@ -30879,7 +33514,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30885: $i/$j" >&5
-+    echo "configure: 33438: $i/$j" >&5
+-    echo "configure: 30882: $i/$j" >&5
++    echo "configure: 33517: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30900,7 +33453,7 @@
+@@ -30897,7 +33532,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30903: $i/$j" >&5
-+    echo "configure: 33456: $i/$j" >&5
+-    echo "configure: 30900: $i/$j" >&5
++    echo "configure: 33535: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30959,12 +33512,12 @@
+@@ -30956,12 +33591,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -35323,7 +34919,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30973,8 +33526,8 @@
+@@ -30970,8 +33605,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -35334,7 +34930,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -31012,8 +33565,8 @@
+@@ -31009,8 +33644,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -35345,7 +34941,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31056,8 +33609,8 @@
+@@ -31053,8 +33688,8 @@
  fi
  
  
@@ -35356,7 +34952,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31089,10 +33642,9 @@
+@@ -31086,10 +33721,9 @@
  
  
  
@@ -35369,7 +34965,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31106,13 +33658,14 @@
+@@ -31103,13 +33737,14 @@
    fi
  
  
@@ -35387,7 +34983,7 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31223,15 +33776,14 @@
+@@ -31220,15 +33855,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -35408,7 +35004,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31283,8 +33835,8 @@
+@@ -31280,8 +33914,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -35419,7 +35015,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31323,8 +33875,8 @@
+@@ -31320,8 +33954,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -35430,7 +35026,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31332,8 +33884,8 @@
+@@ -31329,8 +33963,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -35441,7 +35037,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31526,15 +34078,14 @@
+@@ -31523,15 +34157,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -35462,7 +35058,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31586,8 +34137,8 @@
+@@ -31583,8 +34216,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -35473,7 +35069,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31626,8 +34177,8 @@
+@@ -31623,8 +34256,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -35484,7 +35080,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31635,8 +34186,8 @@
+@@ -31632,8 +34265,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -35495,7 +35091,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31728,22 +34279,22 @@
+@@ -31725,22 +34358,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -35524,7 +35120,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31776,14 +34327,14 @@
+@@ -31773,14 +34406,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -35542,7 +35138,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31826,8 +34377,8 @@
+@@ -31823,8 +34456,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35553,7 +35149,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31838,21 +34389,21 @@
+@@ -31835,21 +34468,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35580,7 +35176,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31895,8 +34446,8 @@
+@@ -31892,8 +34525,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35591,7 +35187,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31907,22 +34458,22 @@
+@@ -31904,22 +34537,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35619,7 +35215,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31965,8 +34516,8 @@
+@@ -31962,8 +34595,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35630,7 +35226,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -31979,21 +34530,21 @@
+@@ -31976,21 +34609,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35657,7 +35253,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32036,8 +34587,8 @@
+@@ -32033,8 +34666,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35668,7 +35264,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32050,22 +34601,22 @@
+@@ -32047,22 +34680,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35696,7 +35292,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32108,12 +34659,12 @@
+@@ -32105,12 +34738,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35713,7 +35309,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32142,14 +34693,14 @@
+@@ -32139,14 +34772,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -35731,7 +35327,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32192,8 +34743,8 @@
+@@ -32189,8 +34822,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35742,7 +35338,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32204,21 +34755,21 @@
+@@ -32201,21 +34834,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35769,7 +35365,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32261,8 +34812,8 @@
+@@ -32258,8 +34891,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35780,7 +35376,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32273,8 +34824,8 @@
+@@ -32270,8 +34903,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35791,7 +35387,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32282,14 +34833,14 @@
+@@ -32279,14 +34912,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -35809,7 +35405,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32332,8 +34883,8 @@
+@@ -32329,8 +34962,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35820,7 +35416,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32344,8 +34895,8 @@
+@@ -32341,8 +34974,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35831,7 +35427,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32353,14 +34904,14 @@
+@@ -32350,14 +34983,14 @@
  
          fi
  
@@ -35849,7 +35445,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32403,12 +34954,12 @@
+@@ -32400,12 +35033,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35866,16 +35462,16 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32423,7 +34974,7 @@
+@@ -32420,7 +35053,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32426: $i/$j" >&5
-+    echo "configure: 34977: $i/$j" >&5
+-    echo "configure: 32423: $i/$j" >&5
++    echo "configure: 35056: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32585,13 +35136,12 @@
+@@ -32582,13 +35215,12 @@
  
  
  
@@ -35892,7 +35488,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32612,13 +35162,13 @@
+@@ -32609,13 +35241,13 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "GCC visibility push" >/dev/null 2>&1; then
  
@@ -35910,7 +35506,7 @@
        { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
                     visibility support. Disabling -fvisibility=hidden" >&5
  echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32638,16 +35188,15 @@
+@@ -32635,16 +35267,15 @@
  
      kde_have_gcc_visibility=no
  
@@ -35931,7 +35527,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32674,24 +35223,36 @@
+@@ -32671,24 +35302,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35976,7 +35572,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -32700,8 +35261,10 @@
+@@ -32697,8 +35340,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35984,11 +35580,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -32714,28 +35277,27 @@
+@@ -32711,28 +35356,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -36026,7 +35622,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32770,24 +35332,36 @@
+@@ -32767,24 +35411,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36071,7 +35667,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -32796,9 +35370,10 @@
+@@ -32793,9 +35449,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36084,7 +35680,7 @@
  
            CXXFLAGS=$safe_CXXFLAGS
            ac_ext=c
-@@ -32810,21 +35385,20 @@
+@@ -32807,21 +35464,20 @@
  
  
  fi
@@ -36111,7 +35707,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32864,24 +35438,36 @@
+@@ -32861,24 +35517,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36156,7 +35752,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -32890,9 +35476,10 @@
+@@ -32887,9 +35555,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36165,11 +35761,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
          CXXFLAGS=$safe_CXXFLAGS
-@@ -32906,8 +35493,8 @@
+@@ -32903,8 +35572,8 @@
  
  
  fi
@@ -36180,7 +35776,7 @@
  
      if test x$kde_cv_val_gcc_visibility_bug = xno; then
        CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32923,8 +35510,8 @@
+@@ -32920,8 +35589,8 @@
        fi
  
  else
@@ -36191,7 +35787,7 @@
   :
  
  fi
-@@ -32933,15 +35520,14 @@
+@@ -32930,15 +35599,14 @@
  
  
  
@@ -36210,7 +35806,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32953,9 +35539,6 @@
+@@ -32950,9 +35618,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36220,7 +35816,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -32978,24 +35561,36 @@
+@@ -32975,24 +35640,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36265,7 +35861,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33004,9 +35599,10 @@
+@@ -33001,9 +35678,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36278,7 +35874,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33019,11 +35615,11 @@
+@@ -33016,11 +35694,11 @@
  fi
  
  
@@ -36294,7 +35890,7 @@
  if test "${kde_cv_proto_setenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33044,8 +35640,7 @@
+@@ -33041,8 +35719,7 @@
  if test "x$kde_cv_proto_setenv" = xunknown; then
  
  
@@ -36304,7 +35900,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33080,24 +35675,36 @@
+@@ -33077,24 +35754,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36349,7 +35945,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33107,10 +35714,11 @@
+@@ -33104,10 +35793,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36359,11 +35955,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -33123,8 +35731,8 @@
+@@ -33120,8 +35810,8 @@
  
  fi
  
@@ -36374,7 +35970,7 @@
  
  if test "x$kde_cv_func_setenv" = xyes; then
  
-@@ -33148,15 +35756,14 @@
+@@ -33145,15 +35835,14 @@
  
  
  
@@ -36393,7 +35989,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33168,9 +35775,6 @@
+@@ -33165,9 +35854,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36403,7 +35999,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33193,24 +35797,36 @@
+@@ -33190,24 +35876,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36448,7 +36044,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33219,9 +35835,10 @@
+@@ -33216,9 +35914,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36461,7 +36057,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33234,11 +35851,11 @@
+@@ -33231,11 +35930,11 @@
  fi
  
  
@@ -36477,7 +36073,7 @@
  if test "${kde_cv_proto_unsetenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33259,8 +35876,7 @@
+@@ -33256,8 +35955,7 @@
  if test "x$kde_cv_proto_unsetenv" = xunknown; then
  
  
@@ -36487,7 +36083,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33295,24 +35911,36 @@
+@@ -33292,24 +35990,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36532,7 +36128,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33322,10 +35950,11 @@
+@@ -33319,10 +36029,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36542,11 +36138,11 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -33338,8 +35967,8 @@
+@@ -33335,8 +36046,8 @@
  
  fi
  
@@ -36557,7 +36153,7 @@
  
  if test "x$kde_cv_func_unsetenv" = xyes; then
  
-@@ -33373,8 +36002,7 @@
+@@ -33370,8 +36081,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -36567,7 +36163,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33384,17 +36012,17 @@
+@@ -33381,17 +36091,17 @@
  
  
     if test "${ac_cv_header_kspeech_h+set}" = set; then
@@ -36591,7 +36187,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33405,24 +36033,36 @@
+@@ -33402,24 +36112,36 @@
  #include <kspeech.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36636,7 +36232,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33431,15 +36071,16 @@
+@@ -33428,15 +36150,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36659,7 +36255,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33448,8 +36089,13 @@
+@@ -33445,8 +36168,13 @@
  /* end confdefs.h.  */
  #include <kspeech.h>
  _ACEOF
@@ -36675,7 +36271,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33473,9 +36119,10 @@
+@@ -33470,9 +36198,10 @@
  
    ac_header_preproc=no
  fi
@@ -36688,7 +36284,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33499,25 +36146,18 @@
+@@ -33496,25 +36225,18 @@
  echo "$as_me: WARNING: kspeech.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: kspeech.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: kspeech.h: in the future, the compiler will take precedence" >&2;}
@@ -36719,7 +36315,7 @@
  
  fi
  if test $ac_cv_header_kspeech_h = yes; then
-@@ -33537,13 +36177,12 @@
+@@ -33534,13 +36256,12 @@
  
      have_latest_kspeech=no
      if test "x$ktts_have_kspeech_h" = xyes; then
@@ -36736,7 +36332,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33570,24 +36209,36 @@
+@@ -33567,24 +36288,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36781,7 +36377,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33596,11 +36247,12 @@
+@@ -33593,11 +36326,12 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36798,7 +36394,7 @@
          CPPFLAGS=$ktts_save_cppflags
          ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -33631,8 +36283,7 @@
+@@ -33628,8 +36362,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -36808,7 +36404,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33642,17 +36293,17 @@
+@@ -33639,17 +36372,17 @@
  
  
     if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
@@ -36832,7 +36428,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33663,24 +36314,36 @@
+@@ -33660,24 +36393,36 @@
  #include <X11/Xlib.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36877,7 +36473,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33689,15 +36352,16 @@
+@@ -33686,15 +36431,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36900,7 +36496,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33706,8 +36370,13 @@
+@@ -33703,8 +36449,13 @@
  /* end confdefs.h.  */
  #include <X11/Xlib.h>
  _ACEOF
@@ -36916,7 +36512,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33731,9 +36400,10 @@
+@@ -33728,9 +36479,10 @@
  
    ac_header_preproc=no
  fi
@@ -36929,7 +36525,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33757,25 +36427,18 @@
+@@ -33754,25 +36506,18 @@
  echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
@@ -36960,7 +36556,7 @@
  
  fi
  
-@@ -33792,8 +36455,7 @@
+@@ -33789,8 +36534,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -36970,7 +36566,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33802,8 +36464,8 @@
+@@ -33799,8 +36543,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -36981,7 +36577,7 @@
  if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33820,24 +36482,36 @@
+@@ -33817,24 +36561,36 @@
  #include <X11/extensions/XKBstr.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37026,7 +36622,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33846,12 +36520,13 @@
+@@ -33843,12 +36599,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37044,7 +36640,7 @@
  if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
    :
  else
-@@ -33872,8 +36547,7 @@
+@@ -33869,8 +36626,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -37054,7 +36650,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33882,8 +36556,8 @@
+@@ -33879,8 +36635,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -37065,7 +36661,7 @@
  if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33900,24 +36574,36 @@
+@@ -33897,24 +36653,36 @@
  #include <X11/XKBlib.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37110,7 +36706,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33926,12 +36612,13 @@
+@@ -33923,12 +36691,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37128,7 +36724,7 @@
  if test $ac_cv_header_X11_XKBlib_h = yes; then
    :
  else
-@@ -33952,8 +36639,7 @@
+@@ -33949,8 +36718,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -37138,7 +36734,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33962,8 +36648,8 @@
+@@ -33959,8 +36727,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -37149,7 +36745,7 @@
  if test "${ac_cv_header_X11_extensions_XKB_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33982,24 +36668,36 @@
+@@ -33979,24 +36747,36 @@
  #include <X11/extensions/XKB.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37194,7 +36790,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34008,12 +36706,13 @@
+@@ -34005,12 +36785,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37212,7 +36808,7 @@
  if test $ac_cv_header_X11_extensions_XKB_h = yes; then
    :
  else
-@@ -34031,13 +36730,13 @@
+@@ -34028,13 +36809,13 @@
  
  
  
@@ -37230,7 +36826,7 @@
  
  compile_ksayit_audio_plugins="no"
  
-@@ -34061,8 +36760,8 @@
+@@ -34058,8 +36839,8 @@
    DO_NOT_COMPILE="$DO_NOT_COMPILE ksayit"
  fi
  
@@ -37241,7 +36837,17 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34088,24 +36787,36 @@
+@@ -34076,7 +36857,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+  bogus endian macros
+ #endif
+ 
+@@ -34085,24 +36867,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37286,7 +36892,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34131,24 +36842,36 @@
+@@ -34128,24 +36922,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37331,7 +36937,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34157,14 +36880,15 @@
+@@ -34154,14 +36960,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37350,7 +36956,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -34174,11 +36898,11 @@
+@@ -34171,11 +36978,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -37366,7 +36972,7 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -34189,24 +36913,36 @@
+@@ -34186,24 +36993,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37411,7 +37017,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34225,8 +36961,10 @@
+@@ -34222,8 +37041,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37423,7 +37029,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -34234,27 +36972,41 @@
+@@ -34231,27 +37052,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -37472,7 +37078,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34267,13 +37019,16 @@
+@@ -34264,13 +37099,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -37493,7 +37099,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -34292,8 +37047,8 @@
+@@ -34289,8 +37127,8 @@
  esac
  
  
@@ -37504,7 +37110,7 @@
  if test "${ac_cv_maxpathlen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34329,8 +37084,8 @@
+@@ -34326,8 +37164,8 @@
  
  fi
  
@@ -37515,7 +37121,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -34351,13 +37106,13 @@
+@@ -34348,13 +37186,13 @@
  
  
  
@@ -37533,7 +37139,7 @@
  
  have_gst=no
  if test "x$with_gstreamer" != xno; then
-@@ -34376,8 +37131,8 @@
+@@ -34373,8 +37211,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
@@ -37544,7 +37150,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34392,28 +37147,29 @@
+@@ -34389,28 +37227,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37580,7 +37186,7 @@
    fi
  
    if test "$PKG_CONFIG" = "no" ; then
-@@ -34424,40 +37180,40 @@
+@@ -34421,40 +37260,40 @@
    else
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -37633,7 +37239,7 @@
          else
              GST_CFLAGS=""
              GST_LIBS=""
-@@ -34558,13 +37314,13 @@
+@@ -34555,13 +37394,13 @@
  
  
  
@@ -37651,7 +37257,7 @@
  
  have_alsa=no
  if test "x$with_alsa" != xno; then
-@@ -34576,10 +37332,9 @@
+@@ -34573,10 +37412,9 @@
  
  
  
@@ -37663,7 +37269,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34593,18 +37348,19 @@
+@@ -34590,18 +37428,19 @@
  for ac_header in sys/asoundlib.h alsa/asoundlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37691,7 +37297,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34615,24 +37371,36 @@
+@@ -34612,24 +37451,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37736,7 +37342,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34641,15 +37409,16 @@
+@@ -34638,15 +37489,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37759,7 +37365,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34658,8 +37427,13 @@
+@@ -34655,8 +37507,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -37775,7 +37381,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -34683,9 +37457,10 @@
+@@ -34680,9 +37537,10 @@
  
    ac_header_preproc=no
  fi
@@ -37788,7 +37394,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34709,25 +37484,19 @@
+@@ -34706,25 +37564,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;}
@@ -37821,7 +37427,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34757,8 +37526,8 @@
+@@ -34754,8 +37606,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -37832,7 +37438,7 @@
  if test "${ac_cv_lib_asound_snd_seq_create_simple_port+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34771,40 +37540,52 @@
+@@ -34768,40 +37620,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37897,7 +37503,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34813,14 +37594,15 @@
+@@ -34810,14 +37674,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37906,7 +37512,7 @@
  fi
 -rm -f conftest.err conftest.$ac_objext \
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
@@ -37917,7 +37523,7 @@
  if test $ac_cv_lib_asound_snd_seq_create_simple_port = yes; then
    :
  else
-@@ -34832,7 +37614,6 @@
+@@ -34829,7 +37694,6 @@
  
  
  
@@ -37925,7 +37531,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -34870,24 +37651,36 @@
+@@ -34867,24 +37731,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37970,7 +37576,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34896,8 +37689,10 @@
+@@ -34893,8 +37769,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37982,7 +37588,7 @@
  
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -34929,24 +37724,36 @@
+@@ -34926,24 +37804,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38027,7 +37633,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34955,8 +37762,10 @@
+@@ -34952,8 +37842,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38039,7 +37645,7 @@
  
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -34988,24 +37797,36 @@
+@@ -34985,24 +37877,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38084,7 +37690,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35014,8 +37835,10 @@
+@@ -35011,8 +37915,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38096,7 +37702,7 @@
    fi
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -35079,21 +37902,21 @@
+@@ -35076,21 +37982,21 @@
  
  
  
@@ -38124,7 +37730,7 @@
  if test "${ac_cv_path_AKODE_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35109,29 +37932,30 @@
+@@ -35106,29 +38012,30 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38161,7 +37767,7 @@
    if test "x$AKODE_CONFIG" != xno; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35171,8 +37995,8 @@
+@@ -35168,8 +38075,8 @@
  
  
  
@@ -38172,7 +37778,7 @@
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35196,24 +38020,36 @@
+@@ -35193,24 +38100,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38217,7 +37823,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35222,12 +38058,13 @@
+@@ -35219,12 +38138,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38235,7 +37841,7 @@
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35240,18 +38077,19 @@
+@@ -35237,18 +38157,19 @@
  for ac_header in sys/time.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38263,7 +37869,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35262,24 +38100,36 @@
+@@ -35259,24 +38180,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38308,7 +37914,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35288,15 +38138,16 @@
+@@ -35285,15 +38218,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38331,7 +37937,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35305,8 +38156,13 @@
+@@ -35302,8 +38236,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -38347,7 +37953,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -35330,9 +38186,10 @@
+@@ -35327,9 +38266,10 @@
  
    ac_header_preproc=no
  fi
@@ -38360,7 +37966,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -35356,25 +38213,19 @@
+@@ -35353,25 +38293,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;}
@@ -38393,7 +37999,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -35394,8 +38245,7 @@
+@@ -35391,8 +38325,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -38403,7 +38009,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35405,17 +38255,17 @@
+@@ -35402,17 +38335,17 @@
  
  
     if test "${ac_cv_header_kspeech_h+set}" = set; then
@@ -38427,7 +38033,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35426,24 +38276,36 @@
+@@ -35423,24 +38356,36 @@
  #include <kspeech.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38472,7 +38078,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35452,15 +38314,16 @@
+@@ -35449,15 +38394,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38495,7 +38101,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35469,8 +38332,13 @@
+@@ -35466,8 +38412,13 @@
  /* end confdefs.h.  */
  #include <kspeech.h>
  _ACEOF
@@ -38511,7 +38117,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -35494,9 +38362,10 @@
+@@ -35491,9 +38442,10 @@
  
    ac_header_preproc=no
  fi
@@ -38524,7 +38130,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35520,25 +38389,18 @@
+@@ -35517,25 +38469,18 @@
  echo "$as_me: WARNING: kspeech.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: kspeech.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: kspeech.h: in the future, the compiler will take precedence" >&2;}
@@ -38555,7 +38161,7 @@
  
  fi
  if test $ac_cv_header_kspeech_h = yes; then
-@@ -35558,13 +38420,12 @@
+@@ -35555,13 +38500,12 @@
  
      have_latest_kspeech=no
      if test "x$ktts_have_kspeech_h" = xyes; then
@@ -38572,7 +38178,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35591,24 +38452,36 @@
+@@ -35588,24 +38532,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38617,7 +38223,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35617,11 +38490,12 @@
+@@ -35614,11 +38570,12 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38634,7 +38240,7 @@
          CPPFLAGS=$ktts_save_cppflags
          ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -35651,12 +38525,11 @@
+@@ -35648,12 +38605,11 @@
  # --- Check for KDE < 3.5 ---
  # If so, install icons.
  
@@ -38650,7 +38256,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35679,24 +38552,36 @@
+@@ -35676,24 +38632,36 @@
  
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38695,7 +38301,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35706,10 +38591,11 @@
+@@ -35703,10 +38671,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38709,7 +38315,7 @@
  
  CXXFLAGS="$kdeversion_save_CXXFLAGS"
  LIBS="$kdeversion_save_LIBS"
-@@ -35721,23 +38607,23 @@
+@@ -35718,23 +38687,23 @@
  
  
  if test "$KTTS_ICONS_DIR" = ""; then
@@ -38741,7 +38347,7 @@
  
  compile_command_plugin="no"
  
-@@ -35757,13 +38643,13 @@
+@@ -35754,13 +38723,13 @@
  
  
  
@@ -38759,7 +38365,7 @@
  
  compile_epos_plugin="yes"
  
-@@ -35773,8 +38659,8 @@
+@@ -35770,8 +38739,8 @@
  
  # Extract the first word of ""epos"", so it can be a program name with args.
  set dummy "epos"; ac_word=$2
@@ -38770,7 +38376,7 @@
  if test "${ac_cv_path_epos_bindir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35789,31 +38675,32 @@
+@@ -35786,31 +38755,32 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38809,7 +38415,7 @@
  if test "x$compile_epos_plugin" != "xno"; then
    include_kttsd_epos_TRUE=
    include_kttsd_epos_FALSE='#'
-@@ -35824,13 +38711,13 @@
+@@ -35821,13 +38791,13 @@
  
  
  
@@ -38827,7 +38433,7 @@
  
  compile_festivalint_plugin="yes"
  
-@@ -35840,8 +38727,8 @@
+@@ -35837,8 +38807,8 @@
  
  # Extract the first word of ""festival"", so it can be a program name with args.
  set dummy "festival"; ac_word=$2
@@ -38838,7 +38444,7 @@
  if test "${ac_cv_path_festival_bindir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35856,31 +38743,32 @@
+@@ -35853,31 +38823,32 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38877,7 +38483,7 @@
  if test "x$compile_festivalint_plugin" = "xyes"; then
    include_kttsd_festivalint_TRUE=
    include_kttsd_festivalint_FALSE='#'
-@@ -35891,13 +38779,13 @@
+@@ -35888,13 +38859,13 @@
  
  
  
@@ -38895,7 +38501,7 @@
  
  compile_flite_plugin="yes"
  
-@@ -35907,8 +38795,8 @@
+@@ -35904,8 +38875,8 @@
  
  # Extract the first word of ""flite"", so it can be a program name with args.
  set dummy "flite"; ac_word=$2
@@ -38906,7 +38512,7 @@
  if test "${ac_cv_path_flite_bindir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35923,31 +38811,32 @@
+@@ -35920,31 +38891,32 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -38945,7 +38551,7 @@
  if test "x$compile_flite_plugin" != "xno"; then
    include_kttsd_flite_TRUE=
    include_kttsd_flite_FALSE='#'
-@@ -35958,13 +38847,13 @@
+@@ -35955,13 +38927,13 @@
  
  
  
@@ -38963,7 +38569,7 @@
  
  compile_freetts_plugin="yes"
  
-@@ -35974,8 +38863,8 @@
+@@ -35971,8 +38943,8 @@
  
  # Extract the first word of ""freetts.jar"", so it can be a program name with args.
  set dummy "freetts.jar"; ac_word=$2
@@ -38974,7 +38580,7 @@
  if test "${ac_cv_path_freetts_bindir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35990,31 +38879,32 @@
+@@ -35987,31 +38959,32 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -39013,7 +38619,7 @@
  if test "x$compile_freetts_plugin" = "xyes"; then
    include_kttsd_freetts_TRUE=
    include_kttsd_freetts_FALSE='#'
-@@ -36025,13 +38915,13 @@
+@@ -36022,13 +38995,13 @@
  
  
  
@@ -39031,7 +38637,7 @@
  
  compile_hadifix_plugin="no"
  
-@@ -36042,8 +38932,8 @@
+@@ -36039,8 +39012,8 @@
  if test "x$compile_hadifix_plugin" = "xyes"; then
          # Extract the first word of ""mbrola"", so it can be a program name with args.
  set dummy "mbrola"; ac_word=$2
@@ -39042,7 +38648,7 @@
  if test "${ac_cv_path_hadifix_mbrola_bin+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36059,32 +38949,33 @@
+@@ -36056,32 +39029,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -39084,7 +38690,7 @@
  if test "${ac_cv_path_hadifix_txt2pho_bin+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36100,29 +38991,30 @@
+@@ -36097,29 +39071,30 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -39121,7 +38727,7 @@
    hadifix_inst="yes"
    if test "x$hadifix_mbrola_bin" = "xno"; then
      hadifix_inst="no"
-@@ -36132,8 +39024,8 @@
+@@ -36129,8 +39104,8 @@
    fi
  
    if test "x$hadifix_inst" = "xyes"; then
@@ -39132,7 +38738,7 @@
  if test "${ac_cv_file__etc_txt2pho+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36147,8 +39039,8 @@
+@@ -36144,8 +39119,8 @@
    ac_cv_file__etc_txt2pho=no
  fi
  fi
@@ -39143,7 +38749,7 @@
  if test $ac_cv_file__etc_txt2pho = yes; then
    hadifix_txt2pho="yes"
  else
-@@ -36189,8 +39081,8 @@
+@@ -36186,8 +39161,8 @@
  fi
  
  for i in $ac_topsubdirs; do
@@ -39154,7 +38760,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -36201,8 +39093,8 @@
+@@ -36198,8 +39173,8 @@
    else
      install_it="no"
    fi
@@ -39165,7 +38771,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -36294,117 +39186,117 @@
+@@ -36291,117 +39266,117 @@
    kttsd_SUBDIR_included_FALSE=
  fi
  
@@ -39339,7 +38945,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -36424,39 +39316,58 @@
+@@ -36421,39 +39396,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -39414,7 +39020,7 @@
    fi
  fi
  rm -f confcache
-@@ -36465,38 +39376,31 @@
+@@ -36462,38 +39456,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -39466,7 +39072,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -36703,11 +39607,35 @@
+@@ -36700,11 +39687,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -39504,7 +39110,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -36716,8 +39644,43 @@
+@@ -36713,8 +39724,43 @@
  fi
  
  
@@ -39549,7 +39155,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -36731,18 +39694,19 @@
+@@ -36728,18 +39774,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -39572,7 +39178,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -36750,159 +39714,120 @@
+@@ -36747,159 +39794,120 @@
  
  
  # Name of the executable.
@@ -39803,7 +39409,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -36911,7 +39836,19 @@
+@@ -36908,7 +39916,19 @@
    as_mkdir_p=false
  fi
  
@@ -39824,7 +39430,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -36920,31 +39857,14 @@
+@@ -36917,31 +39937,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -39856,11 +39462,11 @@
 +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.60.  Invocation command line was
++generated by GNU Autoconf 2.60a.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -36952,30 +39872,20 @@
+@@ -36949,30 +39952,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -39899,7 +39505,16 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -37002,19 +39912,21 @@
+@@ -36980,7 +39973,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
++  -V, --version    print version number and configuration settings, then exit
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+@@ -36999,19 +39992,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -39911,7 +39526,7 @@
  config.status
 -configured by $0, generated by GNU Autoconf 2.59,
 -  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.60a,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
@@ -39927,7 +39542,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -37025,39 +39937,24 @@
+@@ -37022,39 +40017,24 @@
  do
    case $1 in
    --*=*)
@@ -39973,7 +39588,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -37067,18 +39964,24 @@
+@@ -37064,18 +40044,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -40003,7 +39618,7 @@
  
    esac
    shift
-@@ -37094,92 +39997,104 @@
+@@ -37091,92 +40077,104 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -40174,7 +39789,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -37191,551 +40106,743 @@
+@@ -37188,551 +40186,743 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -41408,7 +41023,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -37743,248 +40850,130 @@
+@@ -37740,248 +40930,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -41757,7 +41372,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -37995,135 +40984,39 @@
+@@ -37992,135 +41064,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -41919,7 +41534,7 @@
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -38133,18 +41026,29 @@
+@@ -38130,18 +41106,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
@@ -41957,7 +41572,7 @@
    else
      continue
    fi
-@@ -38166,53 +41070,79 @@
+@@ -38163,53 +41150,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -42174,6 +41789,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -541,7 +550,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=index.docbook screenshot.png Makefile.in man-kmag.1.docbook Makefile.am index.cache.bz2 
++KDE_DIST=screenshot.png Makefile.in man-kmag.1.docbook index.docbook Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kmag.1.docbook screenshot.png index.docbook 
 --- doc/kmousetool/Makefile.in
 +++ doc/kmousetool/Makefile.in
 @@ -93,6 +93,7 @@
@@ -42271,9 +41895,13 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -544,7 +553,7 @@
- KDE_DIST=index.docbook Makefile.in man-kmousetool.1.docbook Makefile.am index.cache.bz2 
+@@ -541,10 +550,10 @@
+ .NOEXPORT:
  
+ #>+ 2
+-KDE_DIST=index.docbook Makefile.in man-kmousetool.1.docbook Makefile.am index.cache.bz2 
++KDE_DIST=Makefile.in index.docbook man-kmousetool.1.docbook Makefile.am index.cache.bz2 
+ 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook man-kmousetool.1.docbook 
 +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kmousetool.1.docbook index.docbook 
@@ -42406,7 +42034,7 @@
  
  #>+ 2
 -KDE_DIST=index.docbook kmouthmain.eps kmouthedit.png Makefile.in kmouthcwcp.eps kmouthwizard.eps kmouthcpref.png kmouthcpref.eps kmouthedit.eps kmouthmain.png man-kmouth.1.docbook kmouthwizard.png Makefile.am kmouthctts.png kmouthctts.eps kmouthcwcp.png index.cache.bz2 
-+KDE_DIST=Makefile.in kmouthcwcp.eps kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthctts.png kmouthcwcp.png kmouthctts.eps kmouthmain.eps index.docbook kmouthedit.png kmouthcpref.png kmouthwizard.eps man-kmouth.1.docbook kmouthwizard.png Makefile.am index.cache.bz2 
++KDE_DIST=Makefile.in kmouthcwcp.eps kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthctts.png kmouthcwcp.png kmouthctts.eps index.docbook kmouthmain.eps kmouthedit.png kmouthwizard.eps kmouthcpref.png man-kmouth.1.docbook Makefile.am kmouthwizard.png index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kmouth.1.docbook kmouthmain.png kmouthedit.png kmouthmain.eps kmouthedit.eps index.docbook kmouthcwcp.png kmouthctts.png kmouthcpref.png kmouthcwcp.eps kmouthctts.eps kmouthwizard.png kmouthcpref.eps kmouthwizard.eps 
@@ -49024,8 +48652,8 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=configure.in subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am kdeaccessibility.lsm acinclude.m4 Makefile.am.in 
-+KDE_DIST=stamp-h.in configure.in Makefile.cvs subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 kdeaccessibility.lsm configure Makefile.am Makefile.am.in 
+-KDE_DIST=configure.in COPYING-DOCS subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am kdeaccessibility.lsm acinclude.m4 Makefile.am.in 
++KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure kdeaccessibility.lsm acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:




More information about the pkg-kde-commits mailing list