rev 4599 - in trunk/packages/kdeadmin/debian: . patches

Christopher Martin chrsmrtn at costa.debian.org
Thu Oct 5 00:35:13 UTC 2006


Author: chrsmrtn
Date: 2006-10-05 00:35:09 +0000 (Thu, 05 Oct 2006)
New Revision: 4599

Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
Log:
Upload kdeadmin.


Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2006-10-05 00:11:54 UTC (rev 4598)
+++ trunk/packages/kdeadmin/debian/changelog	2006-10-05 00:35:09 UTC (rev 4599)
@@ -1,4 +1,4 @@
-kdeadmin (4:3.5.5-1) UNRELEASED; urgency=low
+kdeadmin (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -12,7 +12,7 @@
   * Add support for Etch (patch commited upstream r586643).
     Thanks to Sune Vuorela. (Closes: #387047)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 14 Aug 2006 18:30:39 -0400
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed,  4 Oct 2006 20:13:07 -0400
 
 kdeadmin (4:3.5.4-1) unstable; urgency=low
 

Modified: trunk/packages/kdeadmin/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/98_buildprep.diff	2006-10-05 00:11:54 UTC (rev 4598)
+++ trunk/packages/kdeadmin/debian/patches/98_buildprep.diff	2006-10-05 00:35:09 UTC (rev 4599)
@@ -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,309 @@
+@@ -430,42 +720,334 @@
+ # 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_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
 +#endif
-+#if HAVE_STDINT_H
-+# include <stdint.h>
- #endif
- #if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
@@ -5114,9 +5148,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; }; };;
@@ -5126,15 +5166,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; }; };;
@@ -5528,7 +5562,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,
@@ -5547,7 +5581,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 $@
  
@@ -6435,9 +6469,9 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2270,16 +2949,16 @@
+@@ -2269,16 +2948,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
@@ -6458,7 +6492,7 @@
    fi
  
    # And delete superfluous '/' to make compares easier
-@@ -2292,13 +2971,13 @@
+@@ -2291,13 +2970,13 @@
  
  
  
@@ -6476,7 +6510,7 @@
  
  
    val=
-@@ -2315,11 +2994,11 @@
+@@ -2314,11 +2993,11 @@
  
  
  
@@ -6490,7 +6524,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2329,8 +3008,8 @@
+@@ -2328,8 +3007,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -6501,7 +6535,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2357,15 +3036,15 @@
+@@ -2356,15 +3035,15 @@
  fi
  
  
@@ -6522,7 +6556,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2385,10 +3064,9 @@
+@@ -2384,10 +3063,9 @@
  
  
  
@@ -6535,7 +6569,7 @@
      case $enableval in
        yes)
          kde_use_debug_code="yes"
-@@ -2408,18 +3086,18 @@
+@@ -2407,18 +3085,18 @@
    kde_use_debug_code="no"
        kde_use_debug_define=no
  
@@ -6561,7 +6595,7 @@
      if test $enableval = "no"; then
           kde_use_strict_options="no"
         else
-@@ -2428,12 +3106,12 @@
+@@ -2427,12 +3105,12 @@
  
  else
    kde_use_strict_options="no"
@@ -6578,7 +6612,7 @@
      if test $enableval = "no"; then
           kde_use_warnings="no"
         else
-@@ -2442,20 +3120,21 @@
+@@ -2441,20 +3119,21 @@
  
  else
    kde_use_warnings="yes"
@@ -6605,7 +6639,7 @@
  
      CFLAGS=" $CFLAGS"
  
-@@ -2467,8 +3146,8 @@
+@@ -2466,8 +3145,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
@@ -6616,7 +6650,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2481,32 +3160,34 @@
+@@ -2480,32 +3159,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6658,7 +6692,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2519,36 +3200,51 @@
+@@ -2518,36 +3199,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6720,7 +6754,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2561,74 +3257,34 @@
+@@ -2560,74 +3256,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6804,7 +6838,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2642,7 +3298,7 @@
+@@ -2641,7 +3297,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6813,7 +6847,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2653,6 +3309,7 @@
+@@ -2652,6 +3308,7 @@
    fi
  done
  done
@@ -6821,7 +6855,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2670,22 +3327,23 @@
+@@ -2669,22 +3326,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -6852,7 +6886,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2698,36 +3356,38 @@
+@@ -2697,36 +3355,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6899,7 +6933,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2740,29 +3400,45 @@
+@@ -2739,29 +3399,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6951,7 +6985,7 @@
  fi
  
  fi
-@@ -2775,21 +3451,35 @@
+@@ -2774,21 +3450,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -6995,7 +7029,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2814,46 +3504,70 @@
+@@ -2813,47 +3503,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.
@@ -7049,7 +7083,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
@@ -7086,16 +7120,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
-@@ -2866,19 +3580,23 @@
+ 
+@@ -2865,19 +3585,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
@@ -7119,7 +7158,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2897,22 +3615,27 @@
+@@ -2896,22 +3618,27 @@
      fi
    fi
  fi
@@ -7159,7 +7198,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2923,9 +3646,8 @@
+@@ -2922,9 +3649,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7170,7 +7209,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -2939,14 +3661,14 @@
+@@ -2938,14 +3664,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -7189,7 +7228,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2966,14 +3688,20 @@
+@@ -2965,14 +3691,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -7214,7 +7253,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2991,12 +3719,12 @@
+@@ -2990,12 +3722,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -7231,7 +7270,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3019,24 +3747,36 @@
+@@ -3018,24 +3750,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7276,7 +7315,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3045,24 +3785,28 @@
+@@ -3044,24 +3788,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7313,7 +7352,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3078,24 +3822,147 @@
+@@ -3077,24 +3825,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7326,117 +7365,6 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_cc_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
@@ -7469,69 +7397,90 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3104,12 +3971,20 @@
+@@ -3103,285 +3863,278 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv_prog_cc_g=no
-+
-+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
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -3125,12 +4000,12 @@
-     CFLAGS=
-   fi
- fi
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -  ac_cv_prog_cc_stdc=no
-+  ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
++	CFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3164,12 +4039,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-    function prototypes and stuff, but not '\xHH' hex character constants.
-    These don't provoke an error unfortunately, instead are silently treated
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+-   function prototypes and stuff, but not '\xHH' hex character constants.
+-   These don't provoke an error unfortunately, instead are silently treated
 -   as 'x'.  The following induces an error, until -std1 is added to get
-+   as 'x'.  The following induces an error, until -std is added to get
-    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-    array size at least.  It's necessary to write '\x00'==0 to get something
+-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+-   array size at least.  It's necessary to write '\x00'==0 to get something
 -   that's true only with -std1.  */
-+   that's true only with -std.  */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
  
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+ int
+ main ()
+ {
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 +
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -3184,205 +4064,74 @@
+   ;
    return 0;
  }
  _ACEOF
@@ -7543,13 +7492,12 @@
 -# HP-UX older versions	-Aa -D_HPUX_SOURCE
 -# SVR4			-Xc -D__EXTENSIONS__
 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7591,45 +7539,37 @@
    (exit $ac_status); }; }; then
 -  ac_cv_prog_cc_stdc=$ac_arg
 -break
-+  ac_cv_prog_cc_c89=$ac_arg
++  :
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-+
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
+-done
 -rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
+-CC=$ac_save_CC
++	ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
- fi
+-fi
 -
 -case "x$ac_cv_prog_cc_stdc" in
 -  x|xno)
 -    echo "$as_me:$LINENO: result: none needed" >&5
 -echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-   *)
+-  *)
 -    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
 -    CC="$CC $ac_cv_prog_cc_stdc" ;;
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
+-esac
+-
 -# Some people use a C++ compiler to compile C.  Since we use `exit',
 -# in C++ we need to declare it.  In case someone uses the same compiler
 -# for both compiling C and C++ we need to have the C++ compiler decide
@@ -7677,96 +7617,244 @@
 -/* end confdefs.h.  */
 -$ac_declaration
 -#include <stdlib.h>
--int
--main ()
--{
+ int
+ main ()
+ {
 -exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
 -  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -continue
--fi
++
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end 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
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 -$ac_declaration
--int
--main ()
--{
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+ int
+ main ()
+ {
 -exit (42);
--  ;
--  return 0;
--}
--_ACEOF
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
 -  break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
++  ac_cv_prog_cc_c89=$ac_arg
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
++
++rm -f core conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
 -rm -f conftest*
 -if test -n "$ac_declaration"; then
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
--fi
--
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
+ fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++  xno)
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++  *)
++    CC="$CC $ac_cv_prog_cc_c89"
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
+ 
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -7776,7 +7864,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3391,8 +4140,8 @@
+@@ -3390,8 +4143,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -7787,7 +7875,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3481,8 +4230,8 @@
+@@ -3480,8 +4233,8 @@
  fi
  
  fi
@@ -7798,7 +7886,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3504,8 +4253,8 @@
+@@ -3503,8 +4256,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
@@ -7809,7 +7897,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3539,8 +4288,13 @@
+@@ -3538,8 +4291,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7825,7 +7913,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3565,9 +4319,10 @@
+@@ -3564,9 +4322,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7837,7 +7925,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3577,8 +4332,13 @@
+@@ -3576,8 +4335,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7853,7 +7941,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3605,6 +4365,7 @@
+@@ -3604,6 +4368,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7861,7 +7949,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3622,8 +4383,8 @@
+@@ -3621,8 +4386,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -7872,7 +7960,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3646,8 +4407,13 @@
+@@ -3645,8 +4410,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7888,7 +7976,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3672,9 +4438,10 @@
+@@ -3671,9 +4441,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7900,7 +7988,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3684,8 +4451,13 @@
+@@ -3683,8 +4454,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7916,7 +8004,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3712,6 +4484,7 @@
+@@ -3711,6 +4487,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7924,7 +8012,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3762,18 +4535,22 @@
+@@ -3761,18 +4538,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -7952,7 +8040,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3786,36 +4563,38 @@
+@@ -3785,36 +4566,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7999,7 +8087,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3828,55 +4607,85 @@
+@@ -3827,55 +4610,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8103,7 +8191,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3899,24 +4708,36 @@
+@@ -3898,24 +4711,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8148,7 +8236,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3925,24 +4746,28 @@
+@@ -3924,24 +4749,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8185,7 +8273,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3958,24 +4783,36 @@
+@@ -3957,24 +4786,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8230,7 +8318,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3984,70 +4821,53 @@
+@@ -3983,70 +4824,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8325,7 +8413,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4056,61 +4876,91 @@
+@@ -4055,61 +4879,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8411,12 +8499,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
@@ -8439,7 +8527,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4119,8 +4969,8 @@
+@@ -4118,8 +4972,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -8450,7 +8538,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4209,8 +5059,8 @@
+@@ -4208,8 +5062,8 @@
  fi
  
  fi
@@ -8461,7 +8549,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4228,8 +5078,8 @@
+@@ -4227,8 +5081,8 @@
  
  
  
@@ -8472,7 +8560,7 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4254,24 +5104,36 @@
+@@ -4253,24 +5107,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8517,7 +8605,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4280,13 +5142,14 @@
+@@ -4279,13 +5145,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8536,7 +8624,7 @@
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4328,17 +5191,16 @@
+@@ -4327,17 +5194,16 @@
          fi
        fi
  
@@ -8558,7 +8646,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'
-@@ -4366,24 +5228,36 @@
+@@ -4365,24 +5231,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8603,7 +8691,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4392,8 +5266,10 @@
+@@ -4391,8 +5269,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8611,11 +8699,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
-@@ -4406,29 +5282,28 @@
+@@ -4405,29 +5285,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8653,7 +8741,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'
-@@ -4455,24 +5330,36 @@
+@@ -4454,24 +5333,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8698,7 +8786,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4481,8 +5368,10 @@
+@@ -4480,8 +5371,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8706,11 +8794,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
-@@ -4495,13 +5384,13 @@
+@@ -4494,13 +5387,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8728,7 +8816,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4522,16 +5411,15 @@
+@@ -4521,16 +5414,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -8749,7 +8837,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'
-@@ -4558,24 +5446,36 @@
+@@ -4557,24 +5449,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8794,7 +8882,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4584,8 +5484,10 @@
+@@ -4583,8 +5487,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8802,11 +8890,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
-@@ -4598,16 +5500,16 @@
+@@ -4597,16 +5503,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8827,7 +8915,7 @@
   :
  
  fi
-@@ -4622,16 +5524,15 @@
+@@ -4621,16 +5527,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"
  
@@ -8848,7 +8936,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'
-@@ -4658,24 +5559,36 @@
+@@ -4657,24 +5562,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8893,7 +8981,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4684,8 +5597,10 @@
+@@ -4683,8 +5600,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8901,11 +8989,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
-@@ -4698,27 +5613,26 @@
+@@ -4697,27 +5616,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8940,7 +9028,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4743,24 +5657,36 @@
+@@ -4742,24 +5660,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8985,7 +9073,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4769,8 +5695,10 @@
+@@ -4768,8 +5698,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8993,11 +9081,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
-@@ -4783,13 +5711,13 @@
+@@ -4782,13 +5714,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9015,7 +9103,7 @@
   :
  
  fi
-@@ -4797,16 +5725,15 @@
+@@ -4796,16 +5728,15 @@
            ;;
          esac
  
@@ -9036,7 +9124,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'
-@@ -4833,24 +5760,36 @@
+@@ -4832,24 +5763,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9081,7 +9169,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4859,8 +5798,10 @@
+@@ -4858,8 +5801,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9089,11 +9177,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
-@@ -4873,28 +5814,27 @@
+@@ -4872,28 +5817,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9130,7 +9218,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'
-@@ -4921,24 +5861,36 @@
+@@ -4920,24 +5864,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9175,7 +9263,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4947,8 +5899,10 @@
+@@ -4946,8 +5902,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9183,11 +9271,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
-@@ -4961,28 +5915,27 @@
+@@ -4960,28 +5918,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9224,7 +9312,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'
-@@ -5009,24 +5962,36 @@
+@@ -5008,24 +5965,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9269,7 +9357,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5035,8 +6000,10 @@
+@@ -5034,8 +6003,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9277,11 +9365,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
-@@ -5049,13 +6016,13 @@
+@@ -5048,13 +6019,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9299,7 +9387,7 @@
   :
  
  fi
-@@ -5067,13 +6034,13 @@
+@@ -5066,13 +6037,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -9317,7 +9405,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5081,16 +6048,15 @@
+@@ -5080,16 +6051,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -9338,7 +9426,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'
-@@ -5117,24 +6083,36 @@
+@@ -5116,24 +6086,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9383,7 +9471,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5143,8 +6121,10 @@
+@@ -5142,8 +6124,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9391,11 +9479,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
-@@ -5157,13 +6137,13 @@
+@@ -5156,13 +6140,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9413,7 +9501,7 @@
   :
  
  fi
-@@ -5175,16 +6155,15 @@
+@@ -5174,16 +6158,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -9434,7 +9522,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'
-@@ -5211,24 +6190,36 @@
+@@ -5210,24 +6193,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9479,7 +9567,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5237,8 +6228,10 @@
+@@ -5236,8 +6231,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9487,11 +9575,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
-@@ -5251,28 +6244,27 @@
+@@ -5250,28 +6247,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9528,7 +9616,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'
-@@ -5299,24 +6291,36 @@
+@@ -5298,24 +6294,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9573,7 +9661,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5325,8 +6329,10 @@
+@@ -5324,8 +6332,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9581,11 +9669,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
-@@ -5339,28 +6345,27 @@
+@@ -5338,28 +6348,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9622,7 +9710,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'
-@@ -5387,24 +6392,36 @@
+@@ -5386,24 +6395,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9667,7 +9755,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5413,8 +6430,10 @@
+@@ -5412,8 +6433,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9675,11 +9763,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
-@@ -5427,28 +6446,27 @@
+@@ -5426,28 +6449,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9716,7 +9804,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'
-@@ -5475,24 +6493,36 @@
+@@ -5474,24 +6496,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9761,7 +9849,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5501,8 +6531,10 @@
+@@ -5500,8 +6534,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9769,11 +9857,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
-@@ -5515,13 +6547,13 @@
+@@ -5514,13 +6550,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9791,7 +9879,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5529,37 +6561,37 @@
+@@ -5528,37 +6564,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -9843,7 +9931,7 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5591,24 +6623,36 @@
+@@ -5590,24 +6626,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9888,7 +9976,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5617,18 +6661,19 @@
+@@ -5616,18 +6664,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9898,7 +9986,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"
@@ -9912,7 +10000,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5648,16 +6693,15 @@
+@@ -5647,16 +6696,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -9933,7 +10021,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'
-@@ -5684,24 +6728,36 @@
+@@ -5683,24 +6731,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9978,7 +10066,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5710,8 +6766,10 @@
+@@ -5709,8 +6769,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9986,11 +10074,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
-@@ -5724,29 +6782,28 @@
+@@ -5723,29 +6785,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10028,7 +10116,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'
-@@ -5773,24 +6830,36 @@
+@@ -5772,24 +6833,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10073,7 +10161,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5799,8 +6868,10 @@
+@@ -5798,8 +6871,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10081,11 +10169,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
-@@ -5813,28 +6884,27 @@
+@@ -5812,28 +6887,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10122,7 +10210,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'
-@@ -5861,24 +6931,36 @@
+@@ -5860,24 +6934,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10167,7 +10255,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5887,8 +6969,10 @@
+@@ -5886,8 +6972,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10175,11 +10263,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
-@@ -5901,28 +6985,27 @@
+@@ -5900,28 +6988,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10216,7 +10304,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'
-@@ -5949,24 +7032,36 @@
+@@ -5948,24 +7035,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10261,7 +10349,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5975,8 +7070,10 @@
+@@ -5974,8 +7073,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10269,11 +10357,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
-@@ -5989,28 +7086,27 @@
+@@ -5988,28 +7089,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10310,7 +10398,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'
-@@ -6037,24 +7133,36 @@
+@@ -6036,24 +7136,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10355,7 +10443,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6063,8 +7171,10 @@
+@@ -6062,8 +7174,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10363,11 +10451,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
-@@ -6077,28 +7187,27 @@
+@@ -6076,28 +7190,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10404,7 +10492,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'
-@@ -6125,24 +7234,36 @@
+@@ -6124,24 +7237,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10449,7 +10537,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6151,8 +7272,10 @@
+@@ -6150,8 +7275,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10457,11 +10545,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
-@@ -6165,13 +7288,13 @@
+@@ -6164,13 +7291,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10479,7 +10567,7 @@
   :
  
  fi
-@@ -6278,13 +7401,13 @@
+@@ -6277,13 +7404,13 @@
  fi
  
  
@@ -10496,7 +10584,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6314,8 +7437,13 @@
+@@ -6313,8 +7440,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -10512,7 +10600,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6340,9 +7468,10 @@
+@@ -6339,9 +7471,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -10524,7 +10612,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6352,8 +7481,13 @@
+@@ -6351,8 +7484,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -10540,7 +10628,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6380,6 +7514,7 @@
+@@ -6379,6 +7517,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -10548,7 +10636,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6397,8 +7532,8 @@
+@@ -6396,8 +7535,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -10559,7 +10647,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6421,8 +7556,13 @@
+@@ -6420,8 +7559,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -10575,7 +10663,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6447,9 +7587,10 @@
+@@ -6446,9 +7590,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -10587,7 +10675,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6459,8 +7600,13 @@
+@@ -6458,8 +7603,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -10603,7 +10691,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6487,6 +7633,7 @@
+@@ -6486,6 +7636,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -10611,7 +10699,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6513,16 +7660,15 @@
+@@ -6512,16 +7663,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -10632,7 +10720,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'
-@@ -6549,24 +7695,36 @@
+@@ -6548,24 +7698,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10677,7 +10765,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6575,8 +7733,10 @@
+@@ -6574,8 +7736,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10685,11 +10773,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
-@@ -6589,22 +7749,21 @@
+@@ -6588,22 +7752,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10718,7 +10806,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6620,36 +7779,36 @@
+@@ -6619,36 +7782,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -10765,7 +10853,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'
-@@ -6676,24 +7835,36 @@
+@@ -6675,24 +7838,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10810,7 +10898,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6702,8 +7873,10 @@
+@@ -6701,8 +7876,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10818,11 +10906,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
-@@ -6716,29 +7889,28 @@
+@@ -6715,29 +7892,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10860,7 +10948,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'
-@@ -6765,24 +7937,36 @@
+@@ -6764,24 +7940,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10905,7 +10993,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -6791,8 +7975,10 @@
+@@ -6790,8 +7978,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10913,11 +11001,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
-@@ -6805,13 +7991,13 @@
+@@ -6804,13 +7994,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10935,7 +11023,7 @@
   :
  
  fi
-@@ -6821,13 +8007,13 @@
+@@ -6820,13 +8010,13 @@
  
  
  
@@ -10953,7 +11041,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6840,13 +8026,13 @@
+@@ -6839,13 +8029,13 @@
  
  
  
@@ -10971,7 +11059,7 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6857,278 +8043,99 @@
+@@ -6856,270 +8046,91 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -11018,7 +11106,6 @@
 +      KDE_USE_NMCHECK_TRUE="#"
 +      KDE_USE_NMCHECK_FALSE=""
 +  fi
-+
  
 -int
 -main ()
@@ -11066,7 +11153,18 @@
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
-+
+-fi
+ 
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
+-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +# Check whether --enable-shared was given.
 +if test "${enable_shared+set}" = set; then
 +  enableval=$enable_shared; p=${PACKAGE-default}
@@ -11086,20 +11184,11 @@
 +      IFS="$lt_save_ifs"
 +      ;;
 +    esac
-+else
+ else
 +  enable_shared=yes
- fi
++fi
  
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
  
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
--kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
 +# Check whether --enable-static was given.
 +if test "${enable_static+set}" = set; then
 +  enableval=$enable_static; p=${PACKAGE-default}
@@ -11119,12 +11208,10 @@
 +      IFS="$lt_save_ifs"
 +      ;;
 +    esac
- else
++else
 +  enable_static=no
 +fi
  
- 
- 
 -   ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11132,15 +11219,6 @@
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+
-+    kdelibsuff="$kde_libs_suffix"
-+    if test -z "$kdelibsuff"; then
-+       kdelibsuff="no"
-+    fi
-+    # Check whether --enable-libsuffix was given.
-+if test "${enable_libsuffix+set}" = set; then
-+  enableval=$enable_libsuffix; kdelibsuff=$enableval
-+fi
  
  
 -  save_CXXFLAGS="$CXXFLAGS"
@@ -11151,8 +11229,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    if test "$kdelibsuff" = "auto"; then
- 
+-
 -int
 -main ()
 -{
@@ -11296,32 +11373,25 @@
 -else
 -  enable_static=no
 -fi;
+ 
 -
 -
 -
--
--    kdelibsuff="$kde_libs_suffix"
--    if test -z "$kdelibsuff"; then
--       kdelibsuff="no"
--    fi
 -    # Check whether --enable-libsuffix or --disable-libsuffix was given.
--if test "${enable_libsuffix+set}" = set; then
++    # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
 -  enableval="$enable_libsuffix"
 -  kdelibsuff=$enableval
++  enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+   kdelibsuff="auto"
 -fi;
--
--    if test "$kdelibsuff" = "auto"; then
--
--cat > conftest.c << EOF
--#include <stdio.h>
--int main() {
-+cat > conftest.c << EOF
-+#include <stdio.h>
-+int main() {
-  return 0;
- }
- EOF
-@@ -7143,8 +8150,8 @@
++fi
++
+ 
+     if test "$kdelibsuff" = "auto"; then
+ 
+@@ -7140,8 +8151,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -11332,7 +11402,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7160,14 +8167,13 @@
+@@ -7157,14 +8168,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -11351,22 +11421,22 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7186,10 +8192,11 @@
+@@ -7183,10 +8193,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
-@@ -7213,7 +8220,7 @@
+@@ -7210,7 +8221,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
@@ -11375,7 +11445,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7242,37 +8249,184 @@
+@@ -7239,37 +8250,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -11383,18 +11453,12 @@
 -echo "${ECHO_T}$SED" >&6
 +{ echo "$as_me:$LINENO: result: $SED" >&5
 +echo "${ECHO_T}$SED" >&6; }
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
 +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
 +if test "${ac_cv_path_GREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  # Extract the first word of "grep ggrep" to use in msg output
 +if test -z "$GREP"; then
 +set dummy grep ggrep; ac_prog_name=$2
@@ -11467,8 +11531,11 @@
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
 +
-+
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
@@ -11481,8 +11548,11 @@
 +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
+   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'
 +  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
@@ -11538,25 +11608,25 @@
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
 +else
 +  ac_cv_path_EGREP=$EGREP
 +fi
 +
 +
 +   fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
  
  
- 
 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
++
 +# Check whether --with-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
@@ -11577,7 +11647,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -7301,11 +8455,11 @@
+@@ -7298,11 +8456,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -11593,7 +11663,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7318,7 +8472,7 @@
+@@ -7315,7 +8473,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,
@@ -11602,7 +11672,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'*)
-@@ -7338,21 +8492,21 @@
+@@ -7335,21 +8493,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -11631,7 +11701,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7362,29 +8516,38 @@
+@@ -7359,29 +8517,38 @@
    ;;
  esac
  fi
@@ -11678,7 +11748,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7392,56 +8555,63 @@
+@@ -7389,56 +8556,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -11776,7 +11846,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7468,44 +8638,36 @@
+@@ -7465,44 +8639,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -11831,7 +11901,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7521,7 +8683,7 @@
+@@ -7518,7 +8684,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -11840,7 +11910,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
-@@ -7537,43 +8699,27 @@
+@@ -7534,43 +8700,27 @@
    esac
    ;;
  
@@ -11897,7 +11967,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
-@@ -7592,32 +8738,22 @@
+@@ -7589,32 +8739,22 @@
    ;;
  
  openbsd*)
@@ -11933,7 +12003,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]'
-@@ -7638,17 +8774,20 @@
+@@ -7635,17 +8775,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -11957,7 +12027,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
-@@ -7657,14 +8796,17 @@
+@@ -7654,14 +8797,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -11978,16 +12048,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7691,7 +8833,7 @@
+@@ -7688,7 +8834,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7694 "configure"' > conftest.$ac_ext
-+  echo '#line 8836 "configure"' > conftest.$ac_ext
+-  echo '#line 7691 "configure"' > conftest.$ac_ext
++  echo '#line 8837 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7734,14 +8876,13 @@
+@@ -7731,14 +8877,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -12004,7 +12074,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7753,7 +8894,6 @@
+@@ -7750,7 +8895,6 @@
        esac
        ;;
      *64-bit*)
@@ -12012,7 +12082,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7778,8 +8918,8 @@
+@@ -7775,8 +8919,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -12023,7 +12093,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7805,24 +8945,36 @@
+@@ -7802,24 +8946,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12068,7 +12138,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7831,9 +8983,10 @@
+@@ -7828,9 +8984,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12077,11 +12147,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'
-@@ -7842,22 +8995,42 @@
+@@ -7839,22 +8996,42 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -12095,6 +12165,7 @@
    fi
    ;;
 -
+-esac
 +sparc*-*solaris*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
@@ -12116,7 +12187,7 @@
 +  ;;
 +
 +
- esac
++esac
  
  need_locks="$enable_libtool_lock"
  
@@ -12129,7 +12200,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7881,24 +9054,36 @@
+@@ -7878,24 +9055,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12174,7 +12245,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7907,9 +9092,10 @@
+@@ -7904,9 +9093,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12187,7 +12258,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7965,6 +9151,7 @@
+@@ -7962,6 +9152,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -12195,7 +12266,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7984,18 +9171,27 @@
+@@ -7981,18 +9172,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -12229,7 +12300,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8008,12 +9204,14 @@
+@@ -8005,12 +9205,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -12247,7 +12318,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8036,9 +9234,9 @@
+@@ -8033,9 +9235,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12260,7 +12331,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8052,24 +9250,36 @@
+@@ -8049,24 +9251,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12305,7 +12376,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8078,12 +9288,14 @@
+@@ -8075,12 +9289,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12324,7 +12395,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8098,18 +9310,19 @@
+@@ -8095,18 +9311,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12352,7 +12423,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8120,24 +9333,36 @@
+@@ -8117,24 +9334,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12397,7 +12468,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8146,15 +9371,16 @@
+@@ -8143,15 +9372,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12420,7 +12491,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8163,8 +9389,13 @@
+@@ -8160,8 +9390,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -12436,7 +12507,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8188,9 +9419,10 @@
+@@ -8185,9 +9420,10 @@
  
    ac_header_preproc=no
  fi
@@ -12449,7 +12520,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8214,25 +9446,19 @@
+@@ -8211,25 +9447,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;}
@@ -12482,7 +12553,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8244,342 +9470,708 @@
+@@ -8241,340 +9471,706 @@
  
  done
  
@@ -12595,7 +12666,7 @@
 -
 -
 -# Provide some information about the compiler.
--echo "$as_me:8339:" \
+-echo "$as_me:8336:" \
 -     "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
@@ -13164,8 +13235,7 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }
 +rm -f a.out
- 
--# Define system-specific variables.
++
 +# If we don't use `.F' as extension, the preprocessor is not run on the
 +# input file.  (Note that this only needs to work for GNU compilers.)
 +ac_save_ext=$ac_ext
@@ -13461,12 +13531,10 @@
 +
 +# 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.
+ 
+ # Define system-specific variables.
  case $host_os in
- aix*)
-   symcode='[BCDT]'
-@@ -8594,14 +10186,30 @@
+@@ -8591,14 +10187,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'"
    ;;
@@ -13499,7 +13567,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8619,14 +10227,17 @@
+@@ -8616,14 +10228,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -13519,7 +13587,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8744,15 +10355,15 @@
+@@ -8741,15 +10356,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
@@ -13541,7 +13609,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8766,8 +10377,8 @@
+@@ -8763,8 +10378,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -13552,7 +13620,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8788,7 +10399,7 @@
+@@ -8785,7 +10400,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -13561,7 +13629,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8808,7 +10419,7 @@
+@@ -8805,7 +10420,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -13570,7 +13638,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8818,8 +10429,8 @@
+@@ -8815,8 +10430,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
@@ -13581,7 +13649,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8832,32 +10443,34 @@
+@@ -8829,32 +10444,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13623,7 +13691,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8870,27 +10483,41 @@
+@@ -8867,27 +10484,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13672,7 +13740,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8898,8 +10525,8 @@
+@@ -8895,8 +10526,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
@@ -13683,7 +13751,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8912,32 +10539,34 @@
+@@ -8909,32 +10540,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13725,7 +13793,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8950,27 +10579,41 @@
+@@ -8947,27 +10580,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13774,7 +13842,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8978,8 +10621,8 @@
+@@ -8975,8 +10622,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
@@ -13785,7 +13853,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8992,32 +10635,34 @@
+@@ -8989,32 +10636,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13827,7 +13895,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9030,27 +10675,41 @@
+@@ -9027,27 +10676,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13876,7 +13944,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9065,6 +10724,7 @@
+@@ -9062,6 +10725,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -13884,7 +13952,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9084,21 +10744,32 @@
+@@ -9081,21 +10745,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -13921,7 +13989,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9118,7 +10789,7 @@
+@@ -9115,7 +10790,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13930,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
-@@ -9150,17 +10821,17 @@
+@@ -9147,17 +10822,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -13954,7 +14022,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9180,7 +10851,7 @@
+@@ -9177,7 +10852,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13963,7 +14031,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
-@@ -9212,11 +10883,11 @@
+@@ -9209,11 +10884,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -13979,7 +14047,7 @@
  fi
  
    else
-@@ -9231,21 +10902,21 @@
+@@ -9228,21 +10903,21 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -14008,7 +14076,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -9275,68 +10946,25 @@
+@@ -9272,84 +10947,41 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14040,8 +14108,20 @@
 -    lt_cv_prog_cc_can_build_shared=no
 -  fi
 -fi
--
--
++# save warnings/boilerplate of simple test code
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++
++ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
+ 
+ 
 -#
 -# Check to make sure the static flag actually works.
 -#
@@ -14077,33 +14157,40 @@
 -    lt_prog_compiler_static=
 -fi
 -
-+# save warnings/boilerplate of simple test code
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+
-+ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
- 
- 
- ## CAVEAT EMPTOR:
-@@ -9350,8 +10978,8 @@
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
- 
+-
+-
+-## 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
+-## what you are doing...
+-
+-lt_prog_compiler_no_builtin_flag=
+-
+-if test "$GCC" = yes; then
+-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+-
+-
 -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++## 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
++## what you are doing...
++
++lt_prog_compiler_no_builtin_flag=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
++
 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9365,26 +10993,28 @@
+   lt_cv_prog_compiler_rtti_exceptions=no
+@@ -9362,26 +10994,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 \
@@ -14111,13 +14198,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:9371: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10999: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9368: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11000: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9375: \$? = $ac_status" >&5
-+   echo "$as_me:11003: \$? = $ac_status" >&5
+-   echo "$as_me:9372: \$? = $ac_status" >&5
++   echo "$as_me:11004: \$? = $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
@@ -14139,7 +14226,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"
-@@ -9398,8 +11028,8 @@
+@@ -9395,8 +11029,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -14150,7 +14237,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9437,6 +11067,11 @@
+@@ -9434,6 +11068,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -14162,7 +14249,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9453,7 +11088,7 @@
+@@ -9450,7 +11089,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -14171,7 +14258,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9479,6 +11114,16 @@
+@@ -9476,6 +11115,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -14188,7 +14275,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9490,7 +11135,7 @@
+@@ -9487,7 +11136,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.
@@ -14197,7 +14284,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9513,13 +11158,20 @@
+@@ -9510,13 +11159,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14220,7 +14307,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9534,15 +11186,15 @@
+@@ -9531,15 +11187,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -14242,7 +14329,7 @@
        ;;
  
      sunos4*)
-@@ -9551,7 +11203,7 @@
+@@ -9548,7 +11204,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14251,7 +14338,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9564,6 +11216,17 @@
+@@ -9561,6 +11217,17 @@
        fi
        ;;
  
@@ -14269,7 +14356,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9575,16 +11238,16 @@
+@@ -9572,16 +11239,16 @@
      esac
    fi
  
@@ -14290,7 +14377,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9598,26 +11261,28 @@
+@@ -9595,26 +11262,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 \
@@ -14298,13 +14385,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:9604: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11267: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9601: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11268: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9608: \$? = $ac_status" >&5
-+   echo "$as_me:11271: \$? = $ac_status" >&5
+-   echo "$as_me:9605: \$? = $ac_status" >&5
++   echo "$as_me:11272: \$? = $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
@@ -14326,7 +14413,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9630,7 +11295,7 @@
+@@ -9627,7 +11296,7 @@
  fi
  
  fi
@@ -14335,7 +14422,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9640,8 +11305,50 @@
+@@ -9637,8 +11306,50 @@
      ;;
  esac
  
@@ -14388,7 +14475,7 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9652,60 +11359,58 @@
+@@ -9649,60 +11360,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -14409,13 +14496,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:9671: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11371: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9668: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11372: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9675: \$? = $ac_status" >&5
-+   echo "$as_me:11375: \$? = $ac_status" >&5
+-   echo "$as_me:9672: \$? = $ac_status" >&5
++   echo "$as_me:11376: \$? = $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
@@ -14467,7 +14554,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;}
-@@ -9715,8 +11420,8 @@
+@@ -9712,8 +11421,8 @@
    need_locks=no
  fi
  
@@ -14478,7 +14565,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9754,6 +11459,16 @@
+@@ -9751,6 +11460,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -14495,7 +14582,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9764,6 +11479,10 @@
+@@ -9761,6 +11480,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -14506,7 +14593,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9774,6 +11493,27 @@
+@@ -9771,6 +11494,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -14534,7 +14621,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9811,7 +11551,7 @@
+@@ -9808,7 +11552,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -14543,7 +14630,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9821,13 +11561,13 @@
+@@ -9818,13 +11562,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'
@@ -14560,7 +14647,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
-@@ -9836,23 +11576,70 @@
+@@ -9833,23 +11577,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -14636,7 +14723,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9866,13 +11653,40 @@
+@@ -9863,13 +11654,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14679,7 +14766,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9882,24 +11696,19 @@
+@@ -9879,24 +11697,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14711,7 +14798,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9911,7 +11720,7 @@
+@@ -9908,7 +11721,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -14720,7 +14807,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9933,9 +11742,21 @@
+@@ -9930,9 +11743,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
@@ -14744,7 +14831,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9952,7 +11773,7 @@
+@@ -9949,7 +11774,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -14753,7 +14840,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`
-@@ -9971,8 +11792,12 @@
+@@ -9968,8 +11793,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -14766,7 +14853,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9980,22 +11805,23 @@
+@@ -9977,22 +11806,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -14797,7 +14884,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10011,24 +11837,36 @@
+@@ -10008,24 +11838,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14842,7 +14929,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10042,19 +11880,20 @@
+@@ -10039,19 +11881,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14850,7 +14937,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
  
@@ -14868,7 +14955,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10073,24 +11912,36 @@
+@@ -10070,24 +11913,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14913,7 +15000,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10104,8 +11955,10 @@
+@@ -10101,8 +11956,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14921,11 +15008,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
  
-@@ -10114,13 +11967,11 @@
+@@ -10111,13 +11968,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -14942,7 +15029,7 @@
  	fi
        fi
        ;;
-@@ -10133,7 +11984,7 @@
+@@ -10130,7 +11985,7 @@
        ld_shlibs=no
        ;;
  
@@ -14951,7 +15038,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10143,13 +11994,13 @@
+@@ -10140,13 +11995,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -14968,7 +15055,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.
-@@ -10159,52 +12010,52 @@
+@@ -10156,52 +12011,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -15061,7 +15148,7 @@
      fi
        ;;
  
-@@ -10238,8 +12089,8 @@
+@@ -10235,8 +12090,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15072,7 +15159,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10247,7 +12098,7 @@
+@@ -10244,7 +12099,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -15081,7 +15168,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
-@@ -10261,47 +12112,62 @@
+@@ -10258,47 +12113,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -15168,7 +15255,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10315,7 +12181,7 @@
+@@ -10312,7 +12182,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -15177,7 +15264,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'
-@@ -10325,7 +12191,7 @@
+@@ -10322,7 +12192,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -15186,7 +15273,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10348,7 +12214,8 @@
+@@ -10345,7 +12215,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
@@ -15196,7 +15283,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10358,7 +12225,7 @@
+@@ -10355,7 +12226,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -15205,7 +15292,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10369,14 +12236,14 @@
+@@ -10366,14 +12237,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -15222,7 +15309,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'
-@@ -10388,13 +12255,13 @@
+@@ -10385,13 +12256,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15238,7 +15325,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10402,21 +12269,15 @@
+@@ -10399,21 +12270,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -15264,7 +15351,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'
-@@ -10425,8 +12286,18 @@
+@@ -10422,8 +12287,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15285,7 +15372,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10435,7 +12306,7 @@
+@@ -10432,7 +12307,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.
@@ -15294,7 +15381,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10483,36 +12354,45 @@
+@@ -10480,36 +12355,45 @@
        fi
        ;;
  
@@ -15361,7 +15448,7 @@
        ;;
  
      uts4*)
-@@ -10527,15 +12407,10 @@
+@@ -10524,15 +12408,10 @@
      esac
    fi
  
@@ -15379,7 +15466,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10553,8 +12428,8 @@
+@@ -10550,8 +12429,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.
@@ -15390,7 +15477,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10568,6 +12443,7 @@
+@@ -10565,6 +12444,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -15398,7 +15485,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10590,20 +12466,20 @@
+@@ -10587,20 +12467,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -15424,7 +15511,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10613,7 +12489,20 @@
+@@ -10610,7 +12490,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15446,7 +15533,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10678,7 +12567,7 @@
+@@ -10675,7 +12568,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15455,7 +15542,7 @@
    ;;
  
  beos*)
-@@ -10687,7 +12576,7 @@
+@@ -10684,7 +12577,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -15464,7 +15551,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10703,7 +12592,7 @@
+@@ -10700,7 +12593,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -15473,7 +15560,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10715,7 +12604,8 @@
+@@ -10712,7 +12605,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -15483,7 +15570,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10745,7 +12635,7 @@
+@@ -10742,7 +12636,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15492,7 +15579,7 @@
        ;;
      esac
      ;;
-@@ -10768,7 +12658,7 @@
+@@ -10765,7 +12659,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -15501,7 +15588,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"`
-@@ -10791,20 +12681,17 @@
+@@ -10788,20 +12682,17 @@
    dynamic_linker=no
    ;;
  
@@ -15533,7 +15620,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10822,14 +12709,19 @@
+@@ -10819,14 +12710,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -15555,7 +15642,7 @@
    esac
    ;;
  
-@@ -10849,9 +12741,9 @@
+@@ -10846,9 +12742,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -15567,7 +15654,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10866,7 +12758,7 @@
+@@ -10863,7 +12759,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -15576,7 +15663,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10877,7 +12769,7 @@
+@@ -10874,7 +12770,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -15585,7 +15672,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10889,6 +12781,18 @@
+@@ -10886,6 +12782,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -15604,7 +15691,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10932,30 +12836,27 @@
+@@ -10929,29 +12837,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -15632,18 +15719,16 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
--  # We used to test for /lib/ld.so.1 and disable shared libraries on
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # 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
-@@ -10964,6 +12865,18 @@
+@@ -10961,6 +12866,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -15662,7 +15747,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10973,7 +12886,7 @@
+@@ -10970,7 +12887,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -15671,7 +15756,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11001,8 +12914,13 @@
+@@ -10998,8 +12915,13 @@
  
  openbsd*)
    version_type=sunos
@@ -15686,7 +15771,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
-@@ -11022,7 +12940,7 @@
+@@ -11019,7 +12941,7 @@
  
  os2*)
    libname_spec='$name'
@@ -15695,7 +15780,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11040,13 +12958,6 @@
+@@ -11037,13 +12959,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -15709,7 +15794,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11072,7 +12983,7 @@
+@@ -11069,7 +12984,7 @@
    need_version=yes
    ;;
  
@@ -15718,7 +15803,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'
-@@ -11105,6 +13016,29 @@
+@@ -11102,6 +13017,29 @@
    fi
    ;;
  
@@ -15748,7 +15833,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11116,16 +13050,21 @@
+@@ -11113,16 +13051,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -15776,7 +15861,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11145,8 +13084,8 @@
+@@ -11142,8 +13085,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -15787,7 +15872,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11159,29 +13098,29 @@
+@@ -11156,29 +13099,29 @@
  
  striplib=
  old_striplib=
@@ -15827,7 +15912,7 @@
      ;;
    esac
  fi
-@@ -11213,8 +13152,8 @@
+@@ -11210,8 +13153,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -15838,7 +15923,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11227,40 +13166,52 @@
+@@ -11224,40 +13167,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15903,7 +15988,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11269,14 +13220,15 @@
+@@ -11266,14 +13221,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15912,7 +15997,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
@@ -15923,7 +16008,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11290,8 +13242,8 @@
+@@ -11287,8 +13243,8 @@
     ;;
  
    *)
@@ -15934,7 +16019,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11318,53 +13270,59 @@
+@@ -11315,53 +13271,59 @@
  
  #undef shl_load
  
@@ -16013,7 +16098,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11373,18 +13331,19 @@
+@@ -11370,18 +13332,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16022,7 +16107,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
@@ -16039,7 +16124,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11397,40 +13356,52 @@
+@@ -11394,40 +13357,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16104,7 +16189,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11439,19 +13410,20 @@
+@@ -11436,19 +13411,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16113,7 +16198,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
@@ -16131,7 +16216,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11478,53 +13450,59 @@
+@@ -11475,53 +13451,59 @@
  
  #undef dlopen
  
@@ -16210,7 +16295,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11533,18 +13511,19 @@
+@@ -11530,18 +13512,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16219,7 +16304,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
@@ -16236,7 +16321,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11557,40 +13536,52 @@
+@@ -11554,40 +13537,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16301,7 +16386,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11599,19 +13590,20 @@
+@@ -11596,19 +13591,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16310,7 +16395,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
@@ -16328,7 +16413,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11624,40 +13616,52 @@
+@@ -11621,40 +13617,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16393,7 +16478,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11666,19 +13670,20 @@
+@@ -11663,19 +13671,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16402,7 +16487,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
@@ -16420,7 +16505,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11691,40 +13696,52 @@
+@@ -11688,40 +13697,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16485,7 +16570,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -11733,14 +13750,15 @@
+@@ -11730,14 +13751,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16494,7 +16579,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
@@ -16505,7 +16590,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11775,13 +13793,13 @@
+@@ -11772,13 +13794,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -16522,16 +16607,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11791,7 +13809,7 @@
+@@ -11788,7 +13810,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11794 "configure"
-+#line 13812 "configure"
+-#line 11791 "configure"
++#line 13813 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11848,6 +13866,8 @@
+@@ -11845,6 +13867,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16540,7 +16625,7 @@
  
      exit (status);
  }
-@@ -11857,12 +13877,12 @@
+@@ -11854,12 +13878,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16555,7 +16640,7 @@
      esac
    else :
      # compilation failed
-@@ -11873,13 +13893,13 @@
+@@ -11870,13 +13894,13 @@
  
  
  fi
@@ -16574,16 +16659,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11889,7 +13909,7 @@
+@@ -11886,7 +13910,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11892 "configure"
-+#line 13912 "configure"
+-#line 11889 "configure"
++#line 13913 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11946,6 +13966,8 @@
+@@ -11943,6 +13967,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16592,7 +16677,7 @@
  
      exit (status);
  }
-@@ -11955,12 +13977,12 @@
+@@ -11952,12 +13978,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16607,7 +16692,7 @@
      esac
    else :
      # compilation failed
-@@ -11971,8 +13993,8 @@
+@@ -11968,8 +13994,8 @@
  
  
  fi
@@ -16618,7 +16703,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -11993,19 +14015,19 @@
+@@ -11990,19 +14016,19 @@
  fi
  
  
@@ -16646,7 +16731,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12014,58 +14036,21 @@
+@@ -12011,58 +14037,21 @@
    fi
    ;;
  
@@ -16712,7 +16797,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12080,7 +14065,8 @@
+@@ -12077,7 +14066,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.
@@ -16722,7 +16807,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 \
-@@ -12194,11 +14180,11 @@
+@@ -12191,11 +14181,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16736,7 +16821,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12228,6 +14214,12 @@
+@@ -12225,6 +14215,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -16749,7 +16834,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12239,6 +14231,9 @@
+@@ -12236,6 +14232,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -16759,7 +16844,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12258,7 +14253,7 @@
+@@ -12255,7 +14254,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -16768,7 +16853,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12289,7 +14284,7 @@
+@@ -12286,7 +14285,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -16777,7 +16862,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12304,7 +14299,7 @@
+@@ -12301,7 +14300,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -16786,7 +16871,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12531,7 +14526,10 @@
+@@ -12528,7 +14527,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.
@@ -16798,7 +16883,7 @@
  fi
  
  
-@@ -12544,11 +14542,11 @@
+@@ -12541,11 +14543,11 @@
  CC="$lt_save_CC"
  
  
@@ -16814,7 +16899,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12566,6 +14564,9 @@
+@@ -12563,6 +14565,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -16824,7 +16909,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12596,8 +14597,10 @@
+@@ -12593,8 +14598,10 @@
  
        case $tagname in
        CXX)
@@ -16837,7 +16922,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'
-@@ -12616,6 +14619,7 @@
+@@ -12613,6 +14620,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -16845,7 +16930,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12633,7 +14637,7 @@
+@@ -12630,7 +14638,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -16854,7 +16939,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12643,17 +14647,34 @@
+@@ -12640,17 +14648,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -16890,7 +16975,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12664,18 +14685,27 @@
+@@ -12661,18 +14686,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -16921,7 +17006,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12689,18 +14719,18 @@
+@@ -12686,18 +14720,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -16946,7 +17031,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12729,11 +14759,11 @@
+@@ -12726,11 +14760,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -16962,7 +17047,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12746,7 +14776,7 @@
+@@ -12743,7 +14777,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,
@@ -16971,7 +17056,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'*)
-@@ -12766,21 +14796,21 @@
+@@ -12763,21 +14797,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -17000,7 +17085,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12790,8 +14820,8 @@
+@@ -12787,8 +14821,8 @@
    ;;
  esac
  fi
@@ -17011,7 +17096,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12799,8 +14829,8 @@
+@@ -12796,8 +14830,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
@@ -17022,7 +17107,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12826,7 +14856,7 @@
+@@ -12823,7 +14857,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.
@@ -17031,7 +17116,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12841,8 +14871,8 @@
+@@ -12838,8 +14872,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -17042,7 +17127,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12857,8 +14887,23 @@
+@@ -12854,8 +14888,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -17068,7 +17153,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12875,7 +14920,7 @@
+@@ -12872,7 +14921,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -17077,7 +17162,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`
-@@ -12894,8 +14939,12 @@
+@@ -12891,8 +14940,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -17090,7 +17175,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12904,15 +14953,16 @@
+@@ -12901,15 +14954,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -17111,7 +17196,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.
-@@ -12934,24 +14984,36 @@
+@@ -12931,24 +14985,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17156,7 +17241,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -12965,20 +15027,21 @@
+@@ -12962,20 +15028,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17164,7 +17249,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
  
@@ -17182,7 +17267,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12997,24 +15060,36 @@
+@@ -12994,24 +15061,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17227,7 +17312,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -13028,8 +15103,10 @@
+@@ -13025,8 +15104,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17235,11 +17320,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
  
-@@ -13038,16 +15115,26 @@
+@@ -13035,16 +15116,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17271,7 +17356,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13061,12 +15148,12 @@
+@@ -13058,12 +15149,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'
@@ -17286,7 +17371,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
-@@ -13075,70 +15162,81 @@
+@@ -13072,70 +15163,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -17420,7 +17505,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13149,14 +15247,14 @@
+@@ -13146,14 +15248,14 @@
  	;;
      esac
      ;;
@@ -17437,7 +17522,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13173,12 +15271,12 @@
+@@ -13170,12 +15272,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -17453,7 +17538,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13187,11 +15285,11 @@
+@@ -13184,11 +15286,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.
@@ -17467,7 +17552,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13201,33 +15299,22 @@
+@@ -13198,33 +15300,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -17508,7 +17593,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13238,17 +15325,20 @@
+@@ -13235,17 +15326,20 @@
      esac
  
      case $cc_basename in
@@ -17535,7 +17620,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13264,12 +15354,15 @@
+@@ -13261,12 +15355,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -17555,7 +17640,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13280,11 +15373,25 @@
+@@ -13277,11 +15374,25 @@
  	;;
      esac
      ;;
@@ -17583,7 +17668,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13295,9 +15402,9 @@
+@@ -13292,9 +15403,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -17595,7 +17680,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13306,16 +15413,16 @@
+@@ -13303,16 +15414,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -17616,7 +17701,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13333,20 +15440,44 @@
+@@ -13330,20 +15441,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -17667,7 +17752,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13374,7 +15505,7 @@
+@@ -13371,7 +15506,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -17676,7 +17761,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13384,7 +15515,7 @@
+@@ -13381,7 +15516,7 @@
  	;;
      esac
      ;;
@@ -17685,7 +17770,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=
-@@ -13395,15 +15526,31 @@
+@@ -13392,15 +15527,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::"'
      ;;
@@ -17719,7 +17804,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13413,14 +15560,14 @@
+@@ -13410,14 +15561,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -17737,7 +17822,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13438,7 +15585,7 @@
+@@ -13435,7 +15586,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17746,7 +17831,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13457,13 +15604,13 @@
+@@ -13454,13 +15605,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -17762,7 +17847,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13472,17 +15619,17 @@
+@@ -13469,17 +15620,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -17784,7 +17869,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13501,7 +15648,7 @@
+@@ -13498,7 +15649,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17793,37 +17878,41 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13522,27 +15669,14 @@
+@@ -13519,28 +15670,15 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
 -  sco*)
 -    archive_cmds_need_lc_CXX=no
--    case $cc_basename in
++  sunos4*)
+     case $cc_basename in
 -      CC)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
++      CC*)
++	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
 -      *)
 -	# FIXME: insert proper C++ library support
 -	ld_shlibs_CXX=no
 -	;;
 -    esac
 -    ;;
-   sunos4*)
-     case $cc_basename in
+-  sunos4*)
+-    case $cc_basename in
 -      CC)
-+      CC*)
- 	# Sun C++ 4.x
- 	# FIXME: insert proper C++ library support
- 	ld_shlibs_CXX=no
- 	;;
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	ld_shlibs_CXX=no
+-	;;
 -      lcc)
+-	# Lucid
 +      lcc*)
- 	# Lucid
++	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13555,36 +15689,33 @@
+ 	;;
+@@ -13552,36 +15690,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -17872,7 +17961,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13592,9 +15723,9 @@
+@@ -13589,9 +15724,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -17884,7 +17973,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13604,9 +15735,9 @@
+@@ -13601,9 +15736,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
@@ -17896,7 +17985,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13615,9 +15746,9 @@
+@@ -13612,9 +15747,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -17908,30 +17997,23 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13630,18 +15761,69 @@
+@@ -13627,12 +15762,63 @@
  	;;
      esac
      ;;
 -  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
 +  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 +    no_undefined_flag_CXX='${wl}-z,text'
-     archive_cmds_need_lc_CXX=no
--    ;;
--  tandem*)
++    archive_cmds_need_lc_CXX=no
 +    hardcode_shlibpath_var_CXX=no
 +    runpath_var='LD_RUN_PATH'
 +
-     case $cc_basename in
--      NCC)
--	# NonStop-UX NCC 3.20
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
++    case $cc_basename in
 +      CC*)
 +	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	;;
-       *)
--	# FIXME: insert proper C++ library support
++	;;
++      *)
 +	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	;;
@@ -17955,7 +18037,7 @@
 +    # names for shared libraries.
 +    no_undefined_flag_CXX='${wl}-z,text'
 +    allow_undefined_flag_CXX='${wl}-z,nodefs'
-+    archive_cmds_need_lc_CXX=no
+     archive_cmds_need_lc_CXX=no
 +    hardcode_shlibpath_var_CXX=no
 +    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +    hardcode_libdir_separator_CXX=':'
@@ -17973,20 +18055,15 @@
 +	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	;;
 +    esac
-+    ;;
-+  tandem*)
-+    case $cc_basename in
+     ;;
+   tandem*)
+     case $cc_basename in
+-      NCC)
 +      NCC*)
-+	# NonStop-UX NCC 3.20
-+	# FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
- 	;;
-     esac
-@@ -13655,8 +15837,8 @@
+@@ -13652,8 +15838,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -17997,7 +18074,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13692,7 +15874,7 @@
+@@ -13689,7 +15875,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.
@@ -18006,7 +18083,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13732,7 +15914,7 @@
+@@ -13729,7 +15915,7 @@
         fi
         ;;
  
@@ -18015,7 +18092,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13768,6 +15950,29 @@
+@@ -13765,6 +15951,29 @@
  
  $rm -f confest.$objext
  
@@ -18045,7 +18122,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13776,8 +15981,8 @@
+@@ -13773,8 +15982,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -18056,7 +18133,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13815,6 +16020,10 @@
+@@ -13812,6 +16021,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -18067,7 +18144,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13823,7 +16032,7 @@
+@@ -13820,7 +16033,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18076,7 +18153,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13848,18 +16057,28 @@
+@@ -13845,18 +16058,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -18108,7 +18185,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13867,22 +16086,22 @@
+@@ -13864,22 +16087,22 @@
  	    ;;
  	esac
  	;;
@@ -18137,7 +18214,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13895,9 +16114,13 @@
+@@ -13892,9 +16115,13 @@
  	    ;;
  	esac
  	;;
@@ -18152,7 +18229,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13906,20 +16129,26 @@
+@@ -13903,20 +16130,26 @@
  	    ;;
  	esac
  	;;
@@ -18183,7 +18260,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13936,25 +16165,25 @@
+@@ -13933,25 +16166,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -18214,7 +18291,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13968,24 +16197,15 @@
+@@ -13965,24 +16198,15 @@
  	;;
        psos*)
  	;;
@@ -18241,7 +18318,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13995,12 +16215,12 @@
+@@ -13992,12 +16216,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -18256,7 +18333,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14010,7 +16230,7 @@
+@@ -14007,7 +16231,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -18265,7 +18342,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14018,7 +16238,14 @@
+@@ -14015,7 +16239,14 @@
  	    ;;
  	esac
  	;;
@@ -18281,7 +18358,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14028,16 +16255,16 @@
+@@ -14025,16 +16256,16 @@
      esac
    fi
  
@@ -18302,7 +18379,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14051,26 +16278,28 @@
+@@ -14048,26 +16279,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 \
@@ -18310,13 +18387,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:14057: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16284: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14054: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16285: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14061: \$? = $ac_status" >&5
-+   echo "$as_me:16288: \$? = $ac_status" >&5
+-   echo "$as_me:14058: \$? = $ac_status" >&5
++   echo "$as_me:16289: \$? = $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
@@ -18338,7 +18415,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14083,7 +16312,7 @@
+@@ -14080,7 +16313,7 @@
  fi
  
  fi
@@ -18347,7 +18424,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14093,8 +16322,50 @@
+@@ -14090,8 +16323,50 @@
      ;;
  esac
  
@@ -18400,7 +18477,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14105,60 +16376,58 @@
+@@ -14102,60 +16377,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -18421,13 +18498,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:14124: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16388: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14121: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16389: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14128: \$? = $ac_status" >&5
-+   echo "$as_me:16392: \$? = $ac_status" >&5
+-   echo "$as_me:14125: \$? = $ac_status" >&5
++   echo "$as_me:16393: \$? = $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
@@ -18479,7 +18556,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;}
-@@ -14168,8 +16437,8 @@
+@@ -14165,8 +16438,8 @@
    need_locks=no
  fi
  
@@ -18490,7 +18567,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14186,22 +16455,20 @@
+@@ -14183,22 +16456,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -18519,7 +18596,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14219,8 +16486,8 @@
+@@ -14216,8 +16487,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.
@@ -18530,7 +18607,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14234,6 +16501,7 @@
+@@ -14231,6 +16502,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -18538,7 +18615,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14256,20 +16524,20 @@
+@@ -14253,20 +16525,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -18564,7 +18641,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14279,7 +16547,20 @@
+@@ -14276,7 +16548,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18586,7 +18663,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14344,7 +16625,7 @@
+@@ -14341,7 +16626,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18595,7 +18672,7 @@
    ;;
  
  beos*)
-@@ -14353,7 +16634,7 @@
+@@ -14350,7 +16635,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -18604,7 +18681,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14369,7 +16650,7 @@
+@@ -14366,7 +16651,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -18613,7 +18690,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14381,7 +16662,8 @@
+@@ -14378,7 +16663,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -18623,7 +18700,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14411,7 +16693,7 @@
+@@ -14408,7 +16694,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18632,7 +18709,7 @@
        ;;
      esac
      ;;
-@@ -14434,7 +16716,7 @@
+@@ -14431,7 +16717,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -18641,7 +18718,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"`
-@@ -14457,20 +16739,17 @@
+@@ -14454,20 +16740,17 @@
    dynamic_linker=no
    ;;
  
@@ -18673,7 +18750,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14488,14 +16767,19 @@
+@@ -14485,14 +16768,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -18695,7 +18772,7 @@
    esac
    ;;
  
-@@ -14515,9 +16799,9 @@
+@@ -14512,9 +16800,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -18707,7 +18784,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14532,7 +16816,7 @@
+@@ -14529,7 +16817,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -18716,7 +18793,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14543,7 +16827,7 @@
+@@ -14540,7 +16828,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -18725,7 +18802,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14555,6 +16839,18 @@
+@@ -14552,6 +16840,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -18744,7 +18821,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14598,29 +16894,26 @@
+@@ -14595,29 +16895,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -18781,7 +18858,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,
-@@ -14630,6 +16923,18 @@
+@@ -14627,6 +16924,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18800,7 +18877,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14639,7 +16944,7 @@
+@@ -14636,7 +16945,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -18809,7 +18886,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14667,8 +16972,13 @@
+@@ -14664,8 +16973,13 @@
  
  openbsd*)
    version_type=sunos
@@ -18824,7 +18901,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
-@@ -14688,7 +16998,7 @@
+@@ -14685,7 +16999,7 @@
  
  os2*)
    libname_spec='$name'
@@ -18833,7 +18910,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14706,13 +17016,6 @@
+@@ -14703,13 +17017,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -18847,7 +18924,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14738,7 +17041,7 @@
+@@ -14735,7 +17042,7 @@
    need_version=yes
    ;;
  
@@ -18856,7 +18933,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'
-@@ -14771,6 +17074,29 @@
+@@ -14768,6 +17075,29 @@
    fi
    ;;
  
@@ -18886,7 +18963,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14782,16 +17108,21 @@
+@@ -14779,16 +17109,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -18914,7 +18991,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14811,8 +17142,8 @@
+@@ -14808,8 +17143,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -18925,7 +19002,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14823,1289 +17154,467 @@
+@@ -14820,1266 +17155,444 @@
    enable_fast_install=needless
  fi
  
@@ -18972,11 +19049,74 @@
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
 -    ;;
- 
+-
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
+-
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
+-
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +# The else clause should only fire when bootstrapping the
 +# libtool distribution, otherwise you forgot to ship ltmain.sh
 +# with your package, and you will get complaints that there are
@@ -19035,26 +19175,17 @@
 +    exclude_expsyms_CXX \
 +    include_expsyms_CXX; do
  
--  cygwin*)
--    lt_cv_dlopen="dlopen"
--    lt_cv_dlopen_libs=
--   ;;
--
--  darwin*)
--  # if libdl is installed we need to link against it
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
 +    case $var in
 +    old_archive_cmds_CXX | \
 +    old_archive_from_new_cmds_CXX | \
@@ -19077,79 +19208,22 @@
 +    esac
 +  done
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dl_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
 +  case $lt_echo in
 +  *'\$0 --fallback-echo"')
 +    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 +    ;;
 +  esac
  
--ac_cv_lib_dl_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
 +cfgfile="$ofile"
  
--    lt_cv_dlopen="dyld"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
+-   ;;
 +  cat <<__EOF__ >> "$cfgfile"
 +# ### BEGIN LIBTOOL TAG CONFIG: $tagname
  
--fi
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--   ;;
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
- 
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
@@ -19165,27 +19239,26 @@
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
  
 -#undef shl_load
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -19206,8 +19279,8 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
  
 -int
 -main ()
@@ -19243,10 +19316,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
  
 -ac_cv_func_shl_load=no
 -fi
@@ -19271,10 +19342,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -19317,8 +19386,10 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
 -ac_cv_lib_dld_shl_load=no
 -fi
@@ -19345,28 +19416,30 @@
 -/* 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
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
  
 -/* 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.  */
-+# A C compiler.
-+LTCC=$lt_LTCC
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
 -#undef dlopen
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# A C compiler.
++LTCC=$lt_LTCC
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -19387,8 +19460,8 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
  
 -int
 -main ()
@@ -19424,8 +19497,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# A language-specific compiler.
++CC=$lt_compiler_CXX
  
 -ac_cv_func_dlopen=no
 -fi
@@ -19450,8 +19523,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -19494,8 +19567,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# An ERE matcher.
++EGREP=$lt_EGREP
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -19521,8 +19594,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# The linker used to build libraries.
++LD=$lt_LD_CXX
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -19565,8 +19638,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
 -ac_cv_lib_svld_dlopen=no
 -fi
@@ -19592,8 +19665,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# A BSD-compatible nm program.
++NM=$lt_NM
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -19636,8 +19709,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# A symbol stripping program
++STRIP=$lt_STRIP
  
 -ac_cv_lib_dld_dld_link=no
 -fi
@@ -19650,6 +19723,13 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
+ 
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+ 
+-fi
 +# Used on cygwin: object dumper.
 +OBJDUMP="$OBJDUMP"
  
@@ -19682,43 +19762,36 @@
 +# Executable file suffix (normally "").
 +exeext="$exeext"
  
+-    ;;
+-  esac
 +# Additional compiler flags for building library objects.
 +pic_flag=$lt_lt_prog_compiler_pic_CXX
 +pic_mode=$pic_mode
  
--fi
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
- 
--    ;;
--  esac
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- 
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
  
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
 -    save_LDFLAGS="$LDFLAGS"
 -    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
  
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -19731,20 +19804,20 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15460 "configure"
+-#line 15457 "configure"
 -#include "confdefs.h"
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Do we need a version for libraries?
++need_version=$need_version
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
  
 -#include <stdio.h>
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -19755,8 +19828,8 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -19779,22 +19852,22 @@
 -#    endif
 -#  endif
 -#endif
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -  if (self)
 -    {
@@ -19802,8 +19875,8 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Library versioning type.
-+version_type=$version_type
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
 -    exit (status);
 -}
@@ -19826,18 +19899,17 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
  
-+# 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.
-+library_names_spec=$lt_library_names_spec
++# Library versioning type.
++version_type=$version_type
  
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
@@ -19852,23 +19924,24 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15558 "configure"
+-#line 15555 "configure"
 -#include "confdefs.h"
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# 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.
++library_names_spec=$lt_library_names_spec
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -#include <stdio.h>
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -19879,11 +19952,8 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -19906,25 +19976,26 @@
 -#    endif
 -#  endif
 -#endif
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
  
 -  if (self)
 -    {
@@ -19932,9 +20003,9 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -    exit (status);
 -}
@@ -19959,45 +20030,47 @@
 -rm -fr conftest*
 +# Dependencies to place before the objects being linked to create a
 +# shared library.
-+predeps=$lt_predeps_CXX
++predep_objects=$lt_predep_objects_CXX
  
 +# Dependencies to place after the objects being linked to create a
 +# shared library.
-+postdeps=$lt_postdeps_CXX
++postdep_objects=$lt_postdep_objects_CXX
  
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
  
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
  
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
  
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
 -fi
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
  
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -20055,9 +20128,7 @@
 -    lt_cv_prog_compiler_c_o_CXX \
 -    exclude_expsyms_CXX \
 -    include_expsyms_CXX; do
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
- 
+-
 -    case $var in
 -    old_archive_cmds_CXX | \
 -    old_archive_from_new_cmds_CXX | \
@@ -20079,159 +20150,174 @@
 -      ;;
 -    esac
 -  done
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
  
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 -    ;;
 -  esac
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
+-cfgfile="$ofile"
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +# Take the output of nm and produce a listing of raw symbols and C names.
 +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
  
--cfgfile="$ofile"
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
 +# Transform the output of nm in a proper C declaration
 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
  
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
 +# Transform the output of nm in a C name address pair
 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
 +# This is the shared library runtime path variable.
 +runpath_var=$runpath_var
  
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_CXX
 +# This is the shared library path variable.
 +shlibpath_var=$shlibpath_var
  
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
 +# Is shlibpath searched before the hard-coded library search path?
 +shlibpath_overrides_runpath=$shlibpath_overrides_runpath
  
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
 +# How to hardcode a shared library path into an executable.
 +hardcode_action=$hardcode_action_CXX
  
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
+-# The host system.
+-host_alias=$host_alias
+-host=$host
 +# Whether we should hardcode library paths into libraries.
 +hardcode_into_libs=$hardcode_into_libs
  
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
 +# Flag to hardcode \$libdir into a binary during linking.
 +# This must work even if \$libdir does not exist.
 +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
  
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
 +# If ld is used when linking, flag to hardcode \$libdir into
 +# a binary during linking. This must work even if \$libdir does
 +# not exist.
 +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
  
--# The host system.
--host_alias=$host_alias
--host=$host
+-# A C compiler.
+-LTCC=$lt_LTCC
 +# Whether we need a single -rpath flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
  
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
 +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_direct=$hardcode_direct_CXX
  
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
 +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_minus_L=$hardcode_minus_L_CXX
  
--# A C compiler.
--LTCC=$lt_LTCC
+-# An ERE matcher.
+-EGREP=$lt_EGREP
 +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 +# the resulting binary.
 +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
  
--# A language-specific compiler.
--CC=$lt_compiler_CXX
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
 +# Set to yes if building a shared library automatically hardcodes DIR into the library
 +# and all subsequent libraries and executables linked against it.
 +hardcode_automatic=$hardcode_automatic_CXX
  
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
 +# Variables whose values should be saved in libtool wrapper scripts and
 +# restored at relink time.
 +variables_saved_for_relink="$variables_saved_for_relink"
  
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# A BSD-compatible nm program.
+-NM=$lt_NM
 +# Whether libtool must link a program against all its dependency libraries.
 +link_all_deplibs=$link_all_deplibs_CXX
  
--# The linker used to build libraries.
--LD=$lt_LD_CXX
+-# A symbol stripping program
+-STRIP=$STRIP
 +# Compile-time system search path for libraries
 +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
  
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
 +# Run-time system search path for libraries
 +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
 +# Fix the shell variable \$srcfile for the compiler.
 +fix_srcfile_path="$fix_srcfile_path_CXX"
  
--# A symbol stripping program
--STRIP=$STRIP
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
 +# Set to yes if exported symbols are required.
 +always_export_symbols=$always_export_symbols_CXX
  
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# Used on cygwin: assembler.
+-AS="$AS"
 +# The commands to list exported symbols.
 +export_symbols_cmds=$lt_export_symbols_cmds_CXX
  
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
 +# The commands to extract the exported symbol list from a shared archive.
 +extract_expsyms_cmds=$lt_extract_expsyms_cmds
  
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
 +# Symbols that should not be listed in the preloaded symbols.
 +exclude_expsyms=$lt_exclude_expsyms_CXX
  
--# Used on cygwin: assembler.
--AS="$AS"
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
 +# Symbols that must always be exported.
 +include_expsyms=$lt_include_expsyms_CXX
  
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
 +# ### END LIBTOOL TAG CONFIG: $tagname
  
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
+-# Old archive suffix (normally "a").
+-libext="$libext"
 +__EOF__
  
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
  
--# Object file suffix (normally "o").
--objext="$ac_objext"
+-# Executable file suffix (normally "").
+-exeext="$exeext"
 +else
 +  # If there is no Makefile yet, we rely on a make rule to execute
 +  # `config.status --recheck' to rerun these tests and create the
@@ -20242,19 +20328,20 @@
 +  fi
 +fi
  
--# Old archive suffix (normally "a").
--libext="$libext"
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
  
--# Shared library suffix (normally ".so").
--shrext='$shrext'
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
--# Executable file suffix (normally "").
--exeext="$exeext"
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 +CC=$lt_save_CC
 +LDCXX=$LD
 +LD=$lt_save_LD
@@ -20266,50 +20353,18 @@
 +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
  
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_CXX
--pic_mode=$pic_mode
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
 +	else
 +	  tagname=""
 +	fi
 +	;;
  
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
 +      F77)
 +	if test -n "$F77" && test "X$F77" != "Xno"; then
  
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- 
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
- 
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
-+archive_cmds_need_lc_F77=no
-+allow_undefined_flag_F77=
-+always_export_symbols_F77=no
-+archive_expsym_cmds_F77=
-+export_dynamic_flag_spec_F77=
-+hardcode_direct_F77=no
-+hardcode_libdir_flag_spec_F77=
-+hardcode_libdir_flag_spec_ld_F77=
-+hardcode_libdir_separator_F77=
-+hardcode_minus_L_F77=no
-+hardcode_automatic_F77=no
-+module_cmds_F77=
-+module_expsym_cmds_F77=
-+link_all_deplibs_F77=unknown
-+old_archive_cmds_F77=$old_archive_cmds
-+no_undefined_flag_F77=
-+whole_archive_flag_spec_F77=
-+enable_shared_with_static_runtimes_F77=no
- 
 -# Do we need a version for libraries?
 -need_version=$need_version
 -
@@ -20539,35 +20594,14 @@
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_f77_compiler_gnu
--
--
--archive_cmds_need_lc_F77=no
--allow_undefined_flag_F77=
--always_export_symbols_F77=no
--archive_expsym_cmds_F77=
--export_dynamic_flag_spec_F77=
--hardcode_direct_F77=no
--hardcode_libdir_flag_spec_F77=
--hardcode_libdir_flag_spec_ld_F77=
--hardcode_libdir_separator_F77=
--hardcode_minus_L_F77=no
--hardcode_automatic_F77=no
--module_cmds_F77=
--module_expsym_cmds_F77=
--link_all_deplibs_F77=unknown
--old_archive_cmds_F77=$old_archive_cmds
--no_undefined_flag_F77=
--whole_archive_flag_spec_F77=
--enable_shared_with_static_runtimes_F77=no
--
--# Source file extension for f77 test sources.
--ac_ext=f
-+# Source file extension for f77 test sources.
 +ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
  
- # Object file extension for compiled f77 test sources.
- objext=o
-@@ -16122,29 +17631,55 @@
+ 
+ archive_cmds_need_lc_F77=no
+@@ -16119,29 +17632,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -20607,19 +20641,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
@@ -20631,7 +20665,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16152,21 +17687,21 @@
+@@ -16149,21 +17688,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -20663,7 +20697,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16175,8 +17710,8 @@
+@@ -16172,8 +17711,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -20674,7 +20708,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16214,6 +17749,11 @@
+@@ -16211,6 +17750,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -20686,7 +20720,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16230,7 +17770,7 @@
+@@ -16227,7 +17771,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -20695,7 +20729,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16256,6 +17796,16 @@
+@@ -16253,6 +17797,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -20712,7 +20746,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16267,7 +17817,7 @@
+@@ -16264,7 +17818,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.
@@ -20721,7 +20755,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16290,13 +17840,20 @@
+@@ -16287,13 +17841,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20744,7 +20778,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16311,15 +17868,15 @@
+@@ -16308,15 +17869,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -20766,7 +20800,7 @@
        ;;
  
      sunos4*)
-@@ -16328,7 +17885,7 @@
+@@ -16325,7 +17886,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20775,26 +20809,34 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16341,6 +17898,17 @@
+@@ -16338,27 +17899,38 @@
        fi
        ;;
  
+-    uts4*)
+-      lt_prog_compiler_pic_F77='-pic'
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl_F77='-Wl,'
 +      lt_prog_compiler_pic_F77='-KPIC'
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    *)
++    unicos*)
++      lt_prog_compiler_wl_F77='-Wl,'
+       lt_prog_compiler_can_build_shared_F77=no
+       ;;
+-    esac
++
++    uts4*)
++      lt_prog_compiler_pic_F77='-pic'
 +      lt_prog_compiler_static_F77='-Bstatic'
 +      ;;
 +
-+    unicos*)
-+      lt_prog_compiler_wl_F77='-Wl,'
++    *)
 +      lt_prog_compiler_can_build_shared_F77=no
 +      ;;
-+
-     uts4*)
-       lt_prog_compiler_pic_F77='-pic'
-       lt_prog_compiler_static_F77='-Bstatic'
-@@ -16352,16 +17920,16 @@
-     esac
++    esac
    fi
  
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
@@ -20814,7 +20856,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16375,26 +17943,28 @@
+@@ -16372,26 +17944,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 \
@@ -20822,13 +20864,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:16381: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17949: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16378: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17950: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16385: \$? = $ac_status" >&5
-+   echo "$as_me:17953: \$? = $ac_status" >&5
+-   echo "$as_me:16382: \$? = $ac_status" >&5
++   echo "$as_me:17954: \$? = $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
@@ -20850,7 +20892,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16407,7 +17977,7 @@
+@@ -16404,7 +17978,7 @@
  fi
  
  fi
@@ -20859,7 +20901,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16417,8 +17987,50 @@
+@@ -16414,8 +17988,50 @@
      ;;
  esac
  
@@ -20912,7 +20954,7 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16429,60 +18041,58 @@
+@@ -16426,60 +18042,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -20933,13 +20975,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:16448: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18053: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16445: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18054: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16452: \$? = $ac_status" >&5
-+   echo "$as_me:18057: \$? = $ac_status" >&5
+-   echo "$as_me:16449: \$? = $ac_status" >&5
++   echo "$as_me:18058: \$? = $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
@@ -20991,7 +21033,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;}
-@@ -16492,8 +18102,8 @@
+@@ -16489,8 +18103,8 @@
    need_locks=no
  fi
  
@@ -21002,7 +21044,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16531,6 +18141,16 @@
+@@ -16528,6 +18142,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -21019,7 +21061,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16541,6 +18161,10 @@
+@@ -16538,6 +18162,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -21030,7 +21072,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16551,6 +18175,27 @@
+@@ -16548,6 +18176,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -21058,7 +21100,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16588,7 +18233,7 @@
+@@ -16585,7 +18234,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -21067,7 +21109,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16598,13 +18243,13 @@
+@@ -16595,13 +18244,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'
@@ -21084,7 +21126,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
-@@ -16613,23 +18258,70 @@
+@@ -16610,23 +18259,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -21161,7 +21203,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16643,13 +18335,40 @@
+@@ -16640,13 +18336,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21204,7 +21246,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16659,24 +18378,19 @@
+@@ -16656,24 +18379,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21236,7 +21278,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16688,7 +18402,7 @@
+@@ -16685,7 +18403,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -21245,7 +21287,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16710,9 +18424,21 @@
+@@ -16707,9 +18425,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
@@ -21269,7 +21311,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16729,7 +18455,7 @@
+@@ -16726,7 +18456,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -21278,7 +21320,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`
-@@ -16748,8 +18474,12 @@
+@@ -16745,8 +18475,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -21291,7 +21333,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16757,45 +18487,58 @@
+@@ -16754,45 +18488,58 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -21365,7 +21407,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16809,19 +18552,20 @@
+@@ -16806,19 +18553,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21373,7 +21415,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
  
@@ -21391,7 +21433,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16830,24 +18574,36 @@
+@@ -16827,24 +18575,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21436,7 +21478,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16861,8 +18617,10 @@
+@@ -16858,8 +18618,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21444,11 +21486,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
  
-@@ -16871,13 +18629,11 @@
+@@ -16868,13 +18630,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -21465,7 +21507,7 @@
  	fi
        fi
        ;;
-@@ -16890,7 +18646,7 @@
+@@ -16887,7 +18647,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -21474,7 +21516,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16900,68 +18656,68 @@
+@@ -16897,68 +18657,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -21587,7 +21629,7 @@
      fi
        ;;
  
-@@ -16995,8 +18751,8 @@
+@@ -16992,8 +18752,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21598,7 +21640,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17004,7 +18760,7 @@
+@@ -17001,7 +18761,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -21607,7 +21649,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
-@@ -17018,47 +18774,62 @@
+@@ -17015,47 +18775,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -21676,25 +21718,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
 -	  hardcode_libdir_separator_F77=:
+ 	  hardcode_direct_F77=no
+ 	  hardcode_shlibpath_var_F77=no
+ 	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
 -	  hardcode_direct_F77=no
 -	  hardcode_shlibpath_var_F77=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_F77='-L$libdir'
- 	  hardcode_direct_F77=no
- 	  hardcode_shlibpath_var_F77=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_F77=yes
- 	  ;;
+-	  ;;
  	*)
 -	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_F77=:
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17072,7 +18843,7 @@
+@@ -17069,7 +18844,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -21703,7 +21745,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'
-@@ -17082,7 +18853,7 @@
+@@ -17079,7 +18854,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -21712,7 +21754,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
-@@ -17105,7 +18876,8 @@
+@@ -17102,7 +18877,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
@@ -21722,7 +21764,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17115,7 +18887,7 @@
+@@ -17112,7 +18888,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -21731,7 +21773,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17126,14 +18898,14 @@
+@@ -17123,14 +18899,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -21748,7 +21790,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'
-@@ -17145,13 +18917,13 @@
+@@ -17142,13 +18918,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21764,7 +21806,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17159,21 +18931,15 @@
+@@ -17156,21 +18932,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -21790,7 +21832,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'
-@@ -17182,8 +18948,18 @@
+@@ -17179,8 +18949,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21811,7 +21853,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17192,7 +18968,7 @@
+@@ -17189,7 +18969,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.
@@ -21820,7 +21862,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17240,36 +19016,45 @@
+@@ -17237,36 +19017,45 @@
        fi
        ;;
  
@@ -21887,7 +21929,7 @@
        ;;
  
      uts4*)
-@@ -17284,15 +19069,10 @@
+@@ -17281,15 +19070,10 @@
      esac
    fi
  
@@ -21905,7 +21947,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17310,8 +19090,8 @@
+@@ -17307,8 +19091,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.
@@ -21916,7 +21958,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17325,6 +19105,7 @@
+@@ -17322,6 +19106,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -21924,7 +21966,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17347,20 +19128,20 @@
+@@ -17344,20 +19129,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -21950,7 +21992,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17370,7 +19151,20 @@
+@@ -17367,7 +19152,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21972,7 +22014,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17435,7 +19229,7 @@
+@@ -17432,7 +19230,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21981,7 +22023,7 @@
    ;;
  
  beos*)
-@@ -17444,7 +19238,7 @@
+@@ -17441,7 +19239,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -21990,7 +22032,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17460,7 +19254,7 @@
+@@ -17457,7 +19255,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -21999,7 +22041,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17472,7 +19266,8 @@
+@@ -17469,7 +19267,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -22009,7 +22051,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17502,7 +19297,7 @@
+@@ -17499,7 +19298,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -22018,7 +22060,7 @@
        ;;
      esac
      ;;
-@@ -17525,7 +19320,7 @@
+@@ -17522,7 +19321,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -22027,7 +22069,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"`
-@@ -17548,20 +19343,17 @@
+@@ -17545,20 +19344,17 @@
    dynamic_linker=no
    ;;
  
@@ -22059,7 +22101,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17579,14 +19371,19 @@
+@@ -17576,14 +19372,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -22081,7 +22123,7 @@
    esac
    ;;
  
-@@ -17606,9 +19403,9 @@
+@@ -17603,9 +19404,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -22093,7 +22135,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17623,7 +19420,7 @@
+@@ -17620,7 +19421,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -22102,7 +22144,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17634,7 +19431,7 @@
+@@ -17631,7 +19432,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -22111,7 +22153,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17646,6 +19443,18 @@
+@@ -17643,6 +19444,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -22130,7 +22172,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17689,29 +19498,26 @@
+@@ -17686,29 +19499,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -22167,7 +22209,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,
-@@ -17721,6 +19527,18 @@
+@@ -17718,6 +19528,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -22186,7 +22228,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17730,7 +19548,7 @@
+@@ -17727,7 +19549,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -22195,7 +22237,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17758,8 +19576,13 @@
+@@ -17755,8 +19577,13 @@
  
  openbsd*)
    version_type=sunos
@@ -22210,7 +22252,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
-@@ -17779,7 +19602,7 @@
+@@ -17776,7 +19603,7 @@
  
  os2*)
    libname_spec='$name'
@@ -22219,7 +22261,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17797,13 +19620,6 @@
+@@ -17794,13 +19621,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -22233,7 +22275,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17829,7 +19645,7 @@
+@@ -17826,7 +19646,7 @@
    need_version=yes
    ;;
  
@@ -22242,17 +22284,25 @@
    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'
-@@ -17862,6 +19678,29 @@
+@@ -17859,27 +19679,55 @@
    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
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-*)
+-  dynamic_linker=no
+-  ;;
 +  hardcode_into_libs=yes
 +  if test "$with_gnu_ld" = yes; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -22269,12 +22319,16 @@
 +  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}'
-@@ -17873,16 +19712,21 @@
-   dynamic_linker=no
-   ;;
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
  esac
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
@@ -22300,7 +22354,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17902,8 +19746,8 @@
+@@ -17899,8 +19747,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -22311,7 +22365,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17914,36 +19758,6 @@
+@@ -17911,36 +19759,6 @@
    enable_fast_install=needless
  fi
  
@@ -22348,7 +22402,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17958,7 +19772,8 @@
+@@ -17955,7 +19773,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.
@@ -22358,7 +22412,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 \
-@@ -18058,6 +19873,12 @@
+@@ -18055,6 +19874,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22371,7 +22425,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18069,6 +19890,9 @@
+@@ -18066,6 +19891,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22381,7 +22435,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18088,7 +19912,7 @@
+@@ -18085,7 +19913,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22390,7 +22444,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18119,7 +19943,7 @@
+@@ -18116,7 +19944,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22399,7 +22453,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18134,7 +19958,7 @@
+@@ -18131,7 +19959,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -22408,7 +22462,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18336,7 +20160,10 @@
+@@ -18333,7 +20161,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.
@@ -22420,7 +22474,7 @@
  fi
  
  
-@@ -18357,7 +20184,6 @@
+@@ -18354,7 +20185,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -22428,7 +22482,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18369,26 +20195,55 @@
+@@ -18366,26 +20196,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -22485,7 +22539,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
-@@ -18400,8 +20255,8 @@
+@@ -18397,8 +20256,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -22496,7 +22550,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18415,26 +20270,28 @@
+@@ -18412,26 +20271,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 \
@@ -22504,13 +22558,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:18421: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20276: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18418: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20277: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18425: \$? = $ac_status" >&5
-+   echo "$as_me:20280: \$? = $ac_status" >&5
+-   echo "$as_me:18422: \$? = $ac_status" >&5
++   echo "$as_me:20281: \$? = $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
@@ -22532,7 +22586,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"
-@@ -18448,8 +20305,8 @@
+@@ -18445,8 +20306,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -22543,7 +22597,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18487,6 +20344,11 @@
+@@ -18484,6 +20345,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -22555,7 +22609,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18503,7 +20365,7 @@
+@@ -18500,7 +20366,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -22564,7 +22618,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18529,6 +20391,16 @@
+@@ -18526,6 +20392,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -22581,7 +22635,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18540,7 +20412,7 @@
+@@ -18537,7 +20413,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.
@@ -22590,7 +22644,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18563,13 +20435,20 @@
+@@ -18560,13 +20436,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -22613,7 +22667,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18584,15 +20463,15 @@
+@@ -18581,15 +20464,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -22635,7 +22689,7 @@
        ;;
  
      sunos4*)
-@@ -18601,7 +20480,7 @@
+@@ -18598,7 +20481,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -22644,7 +22698,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18614,6 +20493,17 @@
+@@ -18611,6 +20494,17 @@
        fi
        ;;
  
@@ -22662,7 +22716,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18625,16 +20515,16 @@
+@@ -18622,16 +20516,16 @@
      esac
    fi
  
@@ -22683,7 +22737,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18648,26 +20538,28 @@
+@@ -18645,26 +20539,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 \
@@ -22691,13 +22745,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:18654: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20544: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18651: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20545: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18658: \$? = $ac_status" >&5
-+   echo "$as_me:20548: \$? = $ac_status" >&5
+-   echo "$as_me:18655: \$? = $ac_status" >&5
++   echo "$as_me:20549: \$? = $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
@@ -22719,7 +22773,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18680,7 +20572,7 @@
+@@ -18677,7 +20573,7 @@
  fi
  
  fi
@@ -22728,7 +22782,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18690,8 +20582,50 @@
+@@ -18687,8 +20583,50 @@
      ;;
  esac
  
@@ -22781,7 +22835,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18702,60 +20636,58 @@
+@@ -18699,60 +20637,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -22802,13 +22856,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:18721: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20648: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18718: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20649: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18725: \$? = $ac_status" >&5
-+   echo "$as_me:20652: \$? = $ac_status" >&5
+-   echo "$as_me:18722: \$? = $ac_status" >&5
++   echo "$as_me:20653: \$? = $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
@@ -22860,7 +22914,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;}
-@@ -18765,8 +20697,8 @@
+@@ -18762,8 +20698,8 @@
    need_locks=no
  fi
  
@@ -22871,7 +22925,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18804,6 +20736,16 @@
+@@ -18801,6 +20737,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -22888,7 +22942,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18814,6 +20756,10 @@
+@@ -18811,6 +20757,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -22899,7 +22953,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18824,6 +20770,27 @@
+@@ -18821,6 +20771,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -22927,7 +22981,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18861,7 +20828,7 @@
+@@ -18858,7 +20829,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -22936,7 +22990,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18871,13 +20838,13 @@
+@@ -18868,13 +20839,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'
@@ -22953,7 +23007,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
-@@ -18886,23 +20853,70 @@
+@@ -18883,23 +20854,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -23030,7 +23084,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18916,13 +20930,40 @@
+@@ -18913,13 +20931,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23073,7 +23127,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18932,24 +20973,19 @@
+@@ -18929,24 +20974,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23105,7 +23159,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18961,7 +20997,7 @@
+@@ -18958,7 +20998,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -23114,7 +23168,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18983,9 +21019,21 @@
+@@ -18980,9 +21020,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
@@ -23138,7 +23192,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19002,7 +21050,7 @@
+@@ -18999,7 +21051,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -23147,7 +23201,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`
-@@ -19021,8 +21069,12 @@
+@@ -19018,8 +21070,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -23160,7 +23214,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19030,22 +21082,23 @@
+@@ -19027,22 +21083,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -23191,7 +23245,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19061,24 +21114,36 @@
+@@ -19058,24 +21115,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23236,7 +23290,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19092,19 +21157,20 @@
+@@ -19089,19 +21158,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23244,7 +23298,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
  
@@ -23262,7 +23316,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19123,24 +21189,36 @@
+@@ -19120,24 +21190,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23307,7 +23361,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19154,8 +21232,10 @@
+@@ -19151,8 +21233,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23315,11 +23369,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
  
-@@ -19164,13 +21244,11 @@
+@@ -19161,13 +21245,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23336,7 +23390,7 @@
  	fi
        fi
        ;;
-@@ -19183,7 +21261,7 @@
+@@ -19180,7 +21262,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -23345,7 +23399,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19193,68 +21271,68 @@
+@@ -19190,68 +21272,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -23458,7 +23512,7 @@
      fi
        ;;
  
-@@ -19288,8 +21366,8 @@
+@@ -19285,8 +21367,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23469,7 +23523,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19297,7 +21375,7 @@
+@@ -19294,7 +21376,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -23478,7 +23532,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
-@@ -19311,47 +21389,62 @@
+@@ -19308,47 +21390,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -23565,7 +23619,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19365,7 +21458,7 @@
+@@ -19362,7 +21459,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -23574,7 +23628,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'
-@@ -19375,7 +21468,7 @@
+@@ -19372,7 +21469,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -23583,7 +23637,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
-@@ -19398,7 +21491,8 @@
+@@ -19395,7 +21492,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
@@ -23593,7 +23647,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19408,7 +21502,7 @@
+@@ -19405,7 +21503,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -23602,7 +23656,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19419,14 +21513,14 @@
+@@ -19416,14 +21514,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -23619,7 +23673,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'
-@@ -19438,13 +21532,13 @@
+@@ -19435,13 +21533,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23635,7 +23689,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19452,21 +21546,15 @@
+@@ -19449,21 +21547,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -23661,7 +23715,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'
-@@ -19475,8 +21563,18 @@
+@@ -19472,8 +21564,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23682,7 +23736,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19485,7 +21583,7 @@
+@@ -19482,7 +21584,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.
@@ -23691,7 +23745,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19533,36 +21631,45 @@
+@@ -19530,36 +21632,45 @@
        fi
        ;;
  
@@ -23758,7 +23812,7 @@
        ;;
  
      uts4*)
-@@ -19577,15 +21684,10 @@
+@@ -19574,15 +21685,10 @@
      esac
    fi
  
@@ -23776,7 +23830,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19603,8 +21705,8 @@
+@@ -19600,8 +21706,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.
@@ -23787,7 +23841,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -19618,6 +21720,7 @@
+@@ -19615,6 +21721,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -23795,7 +23849,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19640,20 +21743,20 @@
+@@ -19637,20 +21744,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -23821,7 +23875,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19663,7 +21766,20 @@
+@@ -19660,7 +21767,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23843,7 +23897,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19728,7 +21844,7 @@
+@@ -19725,7 +21845,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23852,7 +23906,7 @@
    ;;
  
  beos*)
-@@ -19737,7 +21853,7 @@
+@@ -19734,7 +21854,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -23861,7 +23915,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19753,7 +21869,7 @@
+@@ -19750,7 +21870,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -23870,7 +23924,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19765,7 +21881,8 @@
+@@ -19762,7 +21882,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -23880,7 +23934,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19795,7 +21912,7 @@
+@@ -19792,7 +21913,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23889,7 +23943,7 @@
        ;;
      esac
      ;;
-@@ -19818,7 +21935,7 @@
+@@ -19815,7 +21936,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -23898,7 +23952,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"`
-@@ -19841,20 +21958,17 @@
+@@ -19838,20 +21959,17 @@
    dynamic_linker=no
    ;;
  
@@ -23930,7 +23984,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19872,14 +21986,19 @@
+@@ -19869,14 +21987,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -23952,7 +24006,7 @@
    esac
    ;;
  
-@@ -19899,9 +22018,9 @@
+@@ -19896,9 +22019,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -23964,7 +24018,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19916,7 +22035,7 @@
+@@ -19913,7 +22036,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -23973,7 +24027,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19927,7 +22046,7 @@
+@@ -19924,7 +22047,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -23982,7 +24036,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19939,6 +22058,18 @@
+@@ -19936,6 +22059,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -24001,7 +24055,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -19982,29 +22113,26 @@
+@@ -19979,29 +22114,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -24038,62 +24092,92 @@
    # 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,
-@@ -20014,6 +22142,18 @@
+@@ -20011,1032 +22143,235 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
+-
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
+-
+-nto-qnx*)
 +netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   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
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -20023,7 +22163,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -20051,8 +22191,13 @@
+   ;;
  
- openbsd*)
+-openbsd*)
++netbsd*)
    version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
+-  shrext=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
 -  need_version=no
-+  # 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
-@@ -20072,7 +22217,7 @@
- 
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -20090,13 +22235,6 @@
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   ;;
- 
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
+-
 -sco3.2v5*)
 -  version_type=osf
 -  soname_spec='${libname}${release}${shared_ext}$major'
@@ -24101,22 +24185,64 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
 -
- solaris*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -20122,7 +22260,7 @@
-   need_version=yes
-   ;;
- 
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
+-
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
+-
 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -20155,891 +22293,84 @@
-   fi
-   ;;
- 
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
+-
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
+-
 -uts4*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -24148,10 +24274,17 @@
 -     test "$hardcode_minus_L_GCJ" != no; then
 -    # Linking always hardcodes the temporary library directory.
 -    hardcode_action_GCJ=relink
--  else
++  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
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action_GCJ=immediate
--  fi
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
+   fi
 -else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
@@ -24803,7 +24936,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20844 "configure"
+-#line 20841 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
@@ -24883,11 +25016,21 @@
 -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
@@ -24901,15 +25044,57 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20942 "configure"
+-#line 20939 "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>
--
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -24919,7 +25104,17 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -24941,24 +25136,78 @@
 -#    endif
 -#  endif
 -#endif
--
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
++sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
 -    exit (status);
 -}
 -EOF
@@ -25075,7 +25324,7 @@
  fi
  
  
-@@ -21056,7 +22387,8 @@
+@@ -21053,7 +22388,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.
@@ -25085,7 +25334,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 \
-@@ -21156,6 +22488,12 @@
+@@ -21153,6 +22489,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -25098,7 +25347,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21167,6 +22505,9 @@
+@@ -21164,6 +22506,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -25108,7 +25357,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21186,7 +22527,7 @@
+@@ -21183,7 +22528,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -25117,7 +25366,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21217,7 +22558,7 @@
+@@ -21214,7 +22559,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -25126,7 +25375,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21232,7 +22573,7 @@
+@@ -21229,7 +22574,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -25135,7 +25384,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21434,7 +22775,10 @@
+@@ -21431,7 +22776,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.
@@ -25147,7 +25396,7 @@
  fi
  
  
-@@ -21454,7 +22798,6 @@
+@@ -21451,7 +22799,6 @@
        RC)
  
  
@@ -25155,7 +25404,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21473,15 +22816,42 @@
+@@ -21470,15 +22817,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -25198,7 +25447,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21497,7 +22867,8 @@
+@@ -21494,7 +22868,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.
@@ -25208,7 +25457,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 \
-@@ -21597,6 +22968,12 @@
+@@ -21594,6 +22969,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -25221,7 +25470,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21608,6 +22985,9 @@
+@@ -21605,6 +22986,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -25231,7 +25480,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21627,7 +23007,7 @@
+@@ -21624,7 +23008,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -25240,7 +25489,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21658,7 +23038,7 @@
+@@ -21655,7 +23039,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -25249,7 +25498,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21673,7 +23053,7 @@
+@@ -21670,7 +23054,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -25258,7 +25507,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21875,7 +23255,10 @@
+@@ -21872,7 +23256,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.
@@ -25270,7 +25519,7 @@
  fi
  
  
-@@ -21922,7 +23305,7 @@
+@@ -21919,7 +23306,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -25279,7 +25528,7 @@
  
  # Prevent multiple expansion
  
-@@ -21977,8 +23360,8 @@
+@@ -21974,8 +23361,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -25290,7 +25539,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22004,17 +23387,17 @@
+@@ -22001,17 +23388,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -25314,7 +25563,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22029,32 +23412,33 @@
+@@ -22026,32 +23413,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -25356,7 +25605,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22063,8 +23447,8 @@
+@@ -22060,8 +23448,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -25367,7 +25616,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22090,11 +23474,11 @@
+@@ -22087,11 +23475,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -25383,7 +25632,7 @@
  fi
  
  
-@@ -22102,8 +23486,8 @@
+@@ -22099,8 +23487,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -25394,7 +25643,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22113,8 +23497,7 @@
+@@ -22110,8 +23498,7 @@
  
  
  
@@ -25404,7 +25653,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'
-@@ -22126,8 +23509,8 @@
+@@ -22123,8 +23510,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -25415,7 +25664,7 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22155,24 +23538,36 @@
+@@ -22152,24 +23539,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25460,7 +25709,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22181,15 +23576,16 @@
+@@ -22178,15 +23577,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25481,7 +25730,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22218,15 +23614,14 @@
+@@ -22215,15 +23615,14 @@
  
  
  
@@ -25500,7 +25749,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'
-@@ -22238,9 +23633,6 @@
+@@ -22235,9 +23634,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25510,7 +25759,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22266,24 +23658,36 @@
+@@ -22263,24 +23659,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25555,7 +25804,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22292,9 +23696,10 @@
+@@ -22289,9 +23697,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25568,7 +25817,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22307,11 +23712,11 @@
+@@ -22304,11 +23713,11 @@
  fi
  
  
@@ -25584,7 +25833,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22332,8 +23737,7 @@
+@@ -22329,8 +23738,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -25594,7 +25843,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'
-@@ -22371,24 +23775,36 @@
+@@ -22368,24 +23776,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25639,7 +25888,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22398,10 +23814,11 @@
+@@ -22395,10 +23815,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25649,11 +25898,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
-@@ -22414,8 +23831,8 @@
+@@ -22411,8 +23832,8 @@
  
  fi
  
@@ -25664,7 +25913,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22439,15 +23856,14 @@
+@@ -22436,15 +23857,14 @@
  
  
  
@@ -25683,7 +25932,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,9 +23875,6 @@
+@@ -22456,9 +23876,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25693,7 +25942,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22486,24 +23899,36 @@
+@@ -22483,24 +23900,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25738,7 +25987,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22512,9 +23937,10 @@
+@@ -22509,9 +23938,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25751,7 +26000,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22527,11 +23953,11 @@
+@@ -22524,11 +23954,11 @@
  fi
  
  
@@ -25767,7 +26016,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22552,8 +23978,7 @@
+@@ -22549,8 +23979,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -25777,7 +26026,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'
-@@ -22590,24 +24015,36 @@
+@@ -22587,24 +24016,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25822,7 +26071,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22617,10 +24054,11 @@
+@@ -22614,10 +24055,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25832,11 +26081,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
-@@ -22633,8 +24071,8 @@
+@@ -22630,8 +24072,8 @@
  
  fi
  
@@ -25847,7 +26096,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22657,8 +24095,8 @@
+@@ -22654,8 +24096,8 @@
  
  
  
@@ -25858,7 +26107,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22675,30 +24113,42 @@
+@@ -22672,30 +24114,42 @@
  int
  main ()
  {
@@ -25910,7 +26159,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22707,20 +24157,21 @@
+@@ -22704,20 +24158,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25919,7 +26168,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
@@ -25938,7 +26187,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22737,30 +24188,42 @@
+@@ -22734,30 +24189,42 @@
  int
  main ()
  {
@@ -25990,7 +26239,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22769,21 +24232,22 @@
+@@ -22766,21 +24233,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25999,7 +26248,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
@@ -26019,7 +26268,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22796,40 +24260,52 @@
+@@ -22793,40 +24261,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26084,7 +26333,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22838,19 +24314,20 @@
+@@ -22835,19 +24315,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26093,7 +26342,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
@@ -26111,7 +26360,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22863,40 +24340,52 @@
+@@ -22860,40 +24341,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26176,7 +26425,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22905,14 +24394,15 @@
+@@ -22902,14 +24395,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26185,7 +26434,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
@@ -26196,7 +26445,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -22938,13 +24428,13 @@
+@@ -22935,13 +24429,13 @@
  
     fi
  
@@ -26213,7 +26462,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'
-@@ -22973,24 +24463,36 @@
+@@ -22970,24 +24464,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26258,7 +26507,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23002,8 +24504,10 @@
+@@ -22999,8 +24505,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26270,7 +26519,7 @@
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23013,17 +24517,17 @@
+@@ -23010,17 +24518,17 @@
  
  fi
  
@@ -26293,7 +26542,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'
-@@ -23052,24 +24556,36 @@
+@@ -23049,24 +24557,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26338,7 +26587,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23081,8 +24597,10 @@
+@@ -23078,8 +24598,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26350,7 +26599,7 @@
           done
           ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23093,8 +24611,8 @@
+@@ -23090,8 +24612,8 @@
  
  fi
  
@@ -26361,7 +26610,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23107,8 +24625,8 @@
+@@ -23104,8 +24626,8 @@
  _ACEOF
  
  
@@ -26372,7 +26621,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23121,40 +24639,52 @@
+@@ -23118,40 +24640,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26437,7 +26686,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23163,21 +24693,22 @@
+@@ -23160,21 +24694,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26446,7 +26695,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
@@ -26466,7 +26715,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23190,40 +24721,52 @@
+@@ -23187,40 +24722,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26531,7 +26780,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23232,21 +24775,22 @@
+@@ -23229,21 +24776,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26540,7 +26789,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
@@ -26560,7 +26809,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23273,53 +24817,59 @@
+@@ -23270,53 +24818,59 @@
  
  #undef inet_ntoa
  
@@ -26639,7 +26888,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23328,17 +24878,18 @@
+@@ -23325,17 +24879,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26648,7 +26897,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
@@ -26664,7 +26913,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23351,40 +24902,52 @@
+@@ -23348,40 +24903,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26729,7 +26978,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23393,21 +24956,22 @@
+@@ -23390,21 +24957,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26738,7 +26987,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
@@ -26758,7 +27007,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23434,53 +24998,59 @@
+@@ -23431,53 +24999,59 @@
  
  #undef connect
  
@@ -26837,7 +27086,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23489,17 +25059,18 @@
+@@ -23486,17 +25060,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26846,7 +27095,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
@@ -26862,7 +27111,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23512,40 +25083,52 @@
+@@ -23509,40 +25084,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26927,7 +27176,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23554,22 +25137,23 @@
+@@ -23551,22 +25138,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26936,7 +27185,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
@@ -26957,7 +27206,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23596,53 +25180,59 @@
+@@ -23593,53 +25181,59 @@
  
  #undef remove
  
@@ -27036,7 +27285,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23651,17 +25241,18 @@
+@@ -23648,17 +25242,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27045,7 +27294,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
@@ -27061,7 +27310,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23674,40 +25265,52 @@
+@@ -23671,40 +25266,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27126,7 +27375,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23716,14 +25319,15 @@
+@@ -23713,14 +25320,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27135,7 +27384,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
@@ -27146,7 +27395,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23731,8 +25335,8 @@
+@@ -23728,8 +25336,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -27157,7 +27406,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23759,53 +25363,59 @@
+@@ -23756,53 +25364,59 @@
  
  #undef shmat
  
@@ -27236,7 +27485,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23814,18 +25424,19 @@
+@@ -23811,18 +25425,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27245,7 +27494,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
@@ -27262,7 +27511,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23838,40 +25449,52 @@
+@@ -23835,40 +25450,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27327,7 +27576,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23880,14 +25503,15 @@
+@@ -23877,14 +25504,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27336,7 +27585,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
@@ -27347,7 +27596,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23901,18 +25525,19 @@
+@@ -23898,18 +25526,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27375,7 +27624,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23923,24 +25548,36 @@
+@@ -23920,24 +25549,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27420,7 +27669,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23949,15 +25586,16 @@
+@@ -23946,15 +25587,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27443,7 +27692,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23966,8 +25604,13 @@
+@@ -23963,8 +25605,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27459,7 +27708,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23991,9 +25634,10 @@
+@@ -23988,9 +25635,10 @@
  
    ac_header_preproc=no
  fi
@@ -27472,7 +27721,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24017,25 +25661,19 @@
+@@ -24014,25 +25662,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;}
@@ -27505,7 +27754,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24053,18 +25691,19 @@
+@@ -24050,18 +25692,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27533,7 +27782,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24075,24 +25714,36 @@
+@@ -24072,24 +25715,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27578,7 +27827,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24101,15 +25752,16 @@
+@@ -24098,15 +25753,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27601,7 +27850,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24118,8 +25770,13 @@
+@@ -24115,8 +25771,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27617,7 +27866,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24143,9 +25800,10 @@
+@@ -24140,9 +25801,10 @@
  
    ac_header_preproc=no
  fi
@@ -27630,7 +27879,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24169,25 +25827,19 @@
+@@ -24166,25 +25828,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;}
@@ -27663,7 +27912,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24201,8 +25853,8 @@
+@@ -24198,8 +25854,8 @@
  
  
     # darwin requires a poll emulation library
@@ -27674,7 +27923,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24215,40 +25867,52 @@
+@@ -24212,40 +25868,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27739,7 +27988,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24257,14 +25921,15 @@
+@@ -24254,14 +25922,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27748,7 +27997,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
@@ -27759,7 +28008,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24275,18 +25940,19 @@
+@@ -24272,18 +25941,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27787,7 +28036,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24297,24 +25963,36 @@
+@@ -24294,24 +25964,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27832,7 +28081,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24323,15 +26001,16 @@
+@@ -24320,15 +26002,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27855,7 +28104,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24340,8 +26019,13 @@
+@@ -24337,8 +26020,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27871,7 +28120,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24365,9 +26049,10 @@
+@@ -24362,9 +26050,10 @@
  
    ac_header_preproc=no
  fi
@@ -27884,7 +28133,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24391,25 +26076,19 @@
+@@ -24388,25 +26077,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;}
@@ -27917,7 +28166,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24424,17 +26103,17 @@
+@@ -24421,17 +26104,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -27941,7 +28190,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24445,24 +26124,36 @@
+@@ -24442,24 +26125,36 @@
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27986,7 +28235,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24471,15 +26162,16 @@
+@@ -24468,15 +26163,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28009,7 +28258,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24488,8 +26180,13 @@
+@@ -24485,8 +26181,13 @@
  /* end confdefs.h.  */
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
@@ -28025,7 +28274,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24513,9 +26210,10 @@
+@@ -24510,9 +26211,10 @@
  
    ac_header_preproc=no
  fi
@@ -28038,7 +28287,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24539,25 +26237,18 @@
+@@ -24536,25 +26238,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;}
@@ -28069,7 +28318,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24574,8 +26265,8 @@
+@@ -24571,8 +26266,8 @@
  
  
  
@@ -28080,7 +28329,7 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24601,31 +26292,43 @@
+@@ -24598,31 +26293,43 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28134,7 +28383,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24636,25 +26339,25 @@
+@@ -24633,25 +26340,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28146,7 +28395,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
  
@@ -28167,7 +28416,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'
-@@ -24666,9 +26369,6 @@
+@@ -24663,9 +26370,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28177,7 +28426,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24694,24 +26394,36 @@
+@@ -24691,24 +26395,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28222,7 +28471,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24720,9 +26432,10 @@
+@@ -24717,9 +26433,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28235,7 +28484,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -24735,11 +26448,11 @@
+@@ -24732,11 +26449,11 @@
  fi
  
  
@@ -28251,7 +28500,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24760,8 +26473,7 @@
+@@ -24757,8 +26474,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -28261,7 +28510,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'
-@@ -24799,24 +26511,36 @@
+@@ -24796,24 +26512,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28306,7 +28555,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24826,10 +26550,11 @@
+@@ -24823,10 +26551,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28316,11 +28565,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
-@@ -24842,8 +26567,8 @@
+@@ -24839,8 +26568,8 @@
  
  fi
  
@@ -28331,7 +28580,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24870,8 +26595,8 @@
+@@ -24867,8 +26596,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -28342,7 +28591,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24884,40 +26609,52 @@
+@@ -24881,40 +26610,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28407,7 +28656,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24926,27 +26663,28 @@
+@@ -24923,27 +26664,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28416,7 +28665,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
@@ -28446,7 +28695,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24959,40 +26697,52 @@
+@@ -24956,40 +26698,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28511,7 +28760,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25001,22 +26751,23 @@
+@@ -24998,22 +26752,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28520,7 +28769,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
@@ -28541,7 +28790,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25027,36 +26778,49 @@
+@@ -25024,36 +26779,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28601,7 +28850,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25065,20 +26829,21 @@
+@@ -25062,23 +26830,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28619,22 +28868,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.
-@@ -25091,10 +26856,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
+@@ -25088,10 +26856,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -28643,7 +28899,7 @@
  test_array [0] = 0
  
    ;
-@@ -25102,24 +26868,36 @@
+@@ -25099,24 +26869,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28688,11 +28944,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25132,10 +26910,11 @@
+@@ -25129,10 +26911,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -28701,7 +28958,7 @@
  test_array [0] = 0
  
    ;
-@@ -25143,24 +26922,36 @@
+@@ -25140,24 +26924,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28746,7 +29003,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25169,30 +26960,32 @@
+@@ -25166,30 +26962,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28779,7 +29036,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -28788,7 +29046,7 @@
  test_array [0] = 0
  
    ;
-@@ -25200,24 +26993,36 @@
+@@ -25197,24 +26996,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28833,11 +29091,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25230,10 +27035,11 @@
+@@ -25227,10 +27038,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -28846,7 +29105,7 @@
  test_array [0] = 0
  
    ;
-@@ -25241,24 +27047,36 @@
+@@ -25238,24 +27051,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28891,7 +29150,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25267,24 +27085,27 @@
+@@ -25264,24 +27089,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28929,11 +29188,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`
-@@ -25295,10 +27116,11 @@
+@@ -25292,10 +27120,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
@@ -28942,7 +29202,7 @@
  test_array [0] = 0
  
    ;
-@@ -25306,24 +27128,36 @@
+@@ -25303,24 +27133,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28987,7 +29247,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25332,26 +27166,20 @@
+@@ -25329,26 +27171,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29001,13 +29261,17 @@
  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)
++'') 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)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_int=0
++	       fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -29020,19 +29284,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25359,8 +27187,9 @@
+@@ -25356,8 +27196,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
-@@ -25369,35 +27198,44 @@
+@@ -25366,35 +27208,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29090,12 +29355,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25408,28 +27246,27 @@
+@@ -25405,28 +27256,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)
@@ -29104,18 +29370,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
@@ -29127,7 +29399,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25440,36 +27277,49 @@
+@@ -25437,36 +27291,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29187,7 +29459,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25478,20 +27328,21 @@
+@@ -25475,23 +27342,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29205,22 +29477,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.
-@@ -25504,10 +27355,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
+@@ -25501,10 +27368,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29229,7 +29508,7 @@
  test_array [0] = 0
  
    ;
-@@ -25515,24 +27367,36 @@
+@@ -25512,24 +27381,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29274,11 +29553,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25545,10 +27409,11 @@
+@@ -25542,10 +27423,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29287,7 +29567,7 @@
  test_array [0] = 0
  
    ;
-@@ -25556,24 +27421,36 @@
+@@ -25553,24 +27436,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29332,7 +29612,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25582,30 +27459,32 @@
+@@ -25579,30 +27474,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29365,7 +29645,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29374,7 +29655,7 @@
  test_array [0] = 0
  
    ;
-@@ -25613,24 +27492,36 @@
+@@ -25610,24 +27508,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29419,11 +29700,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25643,10 +27534,11 @@
+@@ -25640,10 +27550,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29432,7 +29714,7 @@
  test_array [0] = 0
  
    ;
-@@ -25654,24 +27546,36 @@
+@@ -25651,24 +27563,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29477,7 +29759,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25680,24 +27584,27 @@
+@@ -25677,24 +27601,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29515,11 +29797,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`
-@@ -25708,10 +27615,11 @@
+@@ -25705,10 +27632,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29528,7 +29811,7 @@
  test_array [0] = 0
  
    ;
-@@ -25719,24 +27627,36 @@
+@@ -25716,24 +27645,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29573,7 +29856,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25745,26 +27665,20 @@
+@@ -25742,26 +27683,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29587,13 +29870,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
@@ -29606,19 +29893,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25772,8 +27686,9 @@
+@@ -25769,8 +27708,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
-@@ -25782,35 +27697,44 @@
+@@ -25779,35 +27720,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29676,12 +29964,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25821,28 +27745,27 @@
+@@ -25818,28 +27768,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)
@@ -29690,18 +29979,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
@@ -29713,7 +30008,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25853,36 +27776,49 @@
+@@ -25850,36 +27803,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29773,7 +30068,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25891,20 +27827,21 @@
+@@ -25888,23 +27854,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29791,22 +30086,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.
-@@ -25917,10 +27854,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
+@@ -25914,10 +27880,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29815,7 +30117,7 @@
  test_array [0] = 0
  
    ;
-@@ -25928,24 +27866,36 @@
+@@ -25925,24 +27893,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29860,11 +30162,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25958,10 +27908,11 @@
+@@ -25955,10 +27935,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29873,7 +30176,7 @@
  test_array [0] = 0
  
    ;
-@@ -25969,24 +27920,36 @@
+@@ -25966,24 +27948,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29918,7 +30221,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25995,30 +27958,32 @@
+@@ -25992,30 +27986,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29951,7 +30254,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -29960,7 +30264,7 @@
  test_array [0] = 0
  
    ;
-@@ -26026,24 +27991,36 @@
+@@ -26023,24 +28020,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30005,11 +30309,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26056,10 +28033,11 @@
+@@ -26053,10 +28062,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30018,7 +30323,7 @@
  test_array [0] = 0
  
    ;
-@@ -26067,24 +28045,36 @@
+@@ -26064,24 +28075,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30063,7 +30368,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26093,24 +28083,27 @@
+@@ -26090,24 +28113,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30101,11 +30406,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`
-@@ -26121,10 +28114,11 @@
+@@ -26118,10 +28144,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30114,7 +30420,7 @@
  test_array [0] = 0
  
    ;
-@@ -26132,24 +28126,36 @@
+@@ -26129,24 +28157,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30159,7 +30465,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26158,26 +28164,20 @@
+@@ -26155,26 +28195,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30173,13 +30479,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
@@ -30192,19 +30502,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26185,8 +28185,9 @@
+@@ -26182,8 +28220,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
-@@ -26195,35 +28196,44 @@
+@@ -26192,35 +28232,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30262,12 +30573,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26234,28 +28244,27 @@
+@@ -26231,28 +28280,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)
@@ -30276,18 +30588,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
@@ -30299,7 +30617,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26266,36 +28275,49 @@
+@@ -26263,36 +28315,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30359,7 +30677,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26304,20 +28326,21 @@
+@@ -26301,23 +28366,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30377,22 +30695,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.
-@@ -26330,10 +28353,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
+@@ -26327,10 +28392,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30401,7 +30726,7 @@
  test_array [0] = 0
  
    ;
-@@ -26341,24 +28365,36 @@
+@@ -26338,24 +28405,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30446,11 +30771,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26371,10 +28407,11 @@
+@@ -26368,10 +28447,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30459,7 +30785,7 @@
  test_array [0] = 0
  
    ;
-@@ -26382,24 +28419,36 @@
+@@ -26379,24 +28460,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30504,7 +30830,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26408,30 +28457,32 @@
+@@ -26405,30 +28498,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30537,7 +30863,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30546,7 +30873,7 @@
  test_array [0] = 0
  
    ;
-@@ -26439,24 +28490,36 @@
+@@ -26436,24 +28532,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30591,11 +30918,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26469,10 +28532,11 @@
+@@ -26466,10 +28574,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30604,7 +30932,7 @@
  test_array [0] = 0
  
    ;
-@@ -26480,24 +28544,36 @@
+@@ -26477,24 +28587,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30649,7 +30977,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26506,24 +28582,27 @@
+@@ -26503,24 +28625,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30687,11 +31015,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`
-@@ -26534,10 +28613,11 @@
+@@ -26531,10 +28656,12 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
@@ -30700,7 +31029,7 @@
  test_array [0] = 0
  
    ;
-@@ -26545,24 +28625,36 @@
+@@ -26542,24 +28669,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30745,7 +31074,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26571,26 +28663,20 @@
+@@ -26568,26 +28707,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30759,13 +31088,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
@@ -30778,19 +31111,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26598,8 +28684,9 @@
+@@ -26595,8 +28732,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
-@@ -26608,35 +28695,44 @@
+@@ -26605,35 +28744,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30848,12 +31182,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26647,30 +28743,29 @@
+@@ -26644,30 +28792,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 *)
@@ -30862,18 +31197,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
@@ -30887,7 +31228,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26683,40 +28778,52 @@
+@@ -26680,40 +28831,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30952,7 +31293,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26725,14 +28832,15 @@
+@@ -26722,14 +28885,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30961,7 +31302,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
@@ -30972,7 +31313,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26741,8 +28849,8 @@
+@@ -26738,8 +28902,8 @@
  fi
  
  
@@ -30983,7 +31324,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26755,40 +28863,52 @@
+@@ -26752,40 +28916,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -31048,7 +31389,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26797,14 +28917,15 @@
+@@ -26794,14 +28970,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31057,7 +31398,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
@@ -31068,7 +31409,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26818,8 +28939,8 @@
+@@ -26815,8 +28992,8 @@
  
  
  
@@ -31079,7 +31420,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26830,36 +28951,49 @@
+@@ -26827,36 +29004,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31139,7 +31480,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26868,20 +29002,21 @@
+@@ -26865,23 +29055,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31157,22 +31498,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.
-@@ -26894,10 +29029,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
+@@ -26891,10 +29081,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 ()
  {
@@ -31181,7 +31529,7 @@
  test_array [0] = 0
  
    ;
-@@ -26905,24 +29041,36 @@
+@@ -26902,24 +29094,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31226,11 +31574,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26935,10 +29083,11 @@
+@@ -26932,10 +29136,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 ()
  {
@@ -31239,7 +31588,7 @@
  test_array [0] = 0
  
    ;
-@@ -26946,24 +29095,36 @@
+@@ -26943,24 +29149,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31284,7 +31633,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26972,30 +29133,32 @@
+@@ -26969,30 +29187,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31317,7 +31666,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 ()
  {
@@ -31326,7 +31676,7 @@
  test_array [0] = 0
  
    ;
-@@ -27003,24 +29166,36 @@
+@@ -27000,24 +29221,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31371,11 +31721,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27033,10 +29208,11 @@
+@@ -27030,10 +29263,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 ()
  {
@@ -31384,7 +31735,7 @@
  test_array [0] = 0
  
    ;
-@@ -27044,24 +29220,36 @@
+@@ -27041,24 +29276,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31429,7 +31780,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27070,24 +29258,27 @@
+@@ -27067,24 +29314,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31467,11 +31818,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`
-@@ -27098,10 +29289,11 @@
+@@ -27095,10 +29345,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 ()
  {
@@ -31480,7 +31832,7 @@
  test_array [0] = 0
  
    ;
-@@ -27109,24 +29301,36 @@
+@@ -27106,24 +29358,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31525,7 +31877,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27135,26 +29339,20 @@
+@@ -27132,26 +29396,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31539,13 +31891,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
@@ -31558,19 +31914,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27162,8 +29360,9 @@
+@@ -27159,8 +29421,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
-@@ -27172,35 +29371,44 @@
+@@ -27169,35 +29433,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31628,12 +31985,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27211,29 +29419,28 @@
+@@ -27208,29 +29481,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)
@@ -31642,18 +32000,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
@@ -31666,7 +32030,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27244,36 +29451,49 @@
+@@ -27241,36 +29517,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31726,7 +32090,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27282,20 +29502,21 @@
+@@ -27279,23 +29568,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31744,22 +32108,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.
-@@ -27308,10 +29529,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
+@@ -27305,10 +29594,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 ()
  {
@@ -31768,7 +32139,7 @@
  test_array [0] = 0
  
    ;
-@@ -27319,24 +29541,36 @@
+@@ -27316,24 +29607,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31813,11 +32184,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27349,10 +29583,11 @@
+@@ -27346,10 +29649,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 ()
  {
@@ -31826,7 +32198,7 @@
  test_array [0] = 0
  
    ;
-@@ -27360,24 +29595,36 @@
+@@ -27357,24 +29662,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31871,7 +32243,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27386,30 +29633,32 @@
+@@ -27383,30 +29700,33 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31904,7 +32276,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 ()
  {
@@ -31913,7 +32286,7 @@
  test_array [0] = 0
  
    ;
-@@ -27417,24 +29666,36 @@
+@@ -27414,24 +29734,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31958,11 +32331,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27447,10 +29708,11 @@
+@@ -27444,10 +29776,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 ()
  {
@@ -31971,7 +32345,7 @@
  test_array [0] = 0
  
    ;
-@@ -27458,24 +29720,36 @@
+@@ -27455,24 +29789,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32016,7 +32390,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27484,24 +29758,27 @@
+@@ -27481,24 +29827,27 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32054,11 +32428,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`
-@@ -27512,10 +29789,11 @@
+@@ -27509,10 +29858,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 ()
  {
@@ -32067,7 +32442,7 @@
  test_array [0] = 0
  
    ;
-@@ -27523,24 +29801,36 @@
+@@ -27520,24 +29871,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32112,7 +32487,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27549,26 +29839,20 @@
+@@ -27546,26 +29909,24 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32126,13 +32501,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
@@ -32145,19 +32524,20 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27576,8 +29860,9 @@
+@@ -27573,8 +29934,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
-@@ -27586,35 +29871,44 @@
+@@ -27583,35 +29946,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32215,12 +32595,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27625,30 +29919,29 @@
+@@ -27622,30 +29994,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)
@@ -32229,18 +32610,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
@@ -32254,7 +32641,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27669,36 +29962,48 @@
+@@ -27666,36 +30041,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32315,7 +32702,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!
-@@ -27710,18 +30015,18 @@
+@@ -27707,18 +30094,18 @@
     { (exit 1); exit 1; }; }
  
  fi
@@ -32339,7 +32726,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'
-@@ -27751,24 +30056,36 @@
+@@ -27748,24 +30135,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32384,7 +32771,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27777,9 +30094,10 @@
+@@ -27774,9 +30173,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32393,11 +32780,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
-@@ -27792,26 +30110,26 @@
+@@ -27789,26 +30189,26 @@
  
  
  fi
@@ -32434,7 +32821,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27830,18 +30148,19 @@
+@@ -27827,18 +30227,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32462,7 +32849,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27852,24 +30171,36 @@
+@@ -27849,24 +30250,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32507,7 +32894,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27878,15 +30209,16 @@
+@@ -27875,15 +30288,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32530,7 +32917,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27895,8 +30227,13 @@
+@@ -27892,8 +30306,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -32546,7 +32933,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -27920,9 +30257,10 @@
+@@ -27917,9 +30336,10 @@
  
    ac_header_preproc=no
  fi
@@ -32559,7 +32946,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27946,25 +30284,19 @@
+@@ -27943,25 +30363,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;}
@@ -32592,7 +32979,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27976,8 +30308,8 @@
+@@ -27973,8 +30387,8 @@
  
  done
  
@@ -32603,7 +32990,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28004,53 +30336,59 @@
+@@ -28001,53 +30415,59 @@
  
  #undef _NSGetEnviron
  
@@ -32682,7 +33069,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28059,13 +30397,14 @@
+@@ -28056,13 +30476,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32691,7 +33078,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
@@ -32701,7 +33088,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28086,9 +30425,9 @@
+@@ -28083,9 +30504,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -32714,7 +33101,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28114,53 +30453,59 @@
+@@ -28111,53 +30532,59 @@
  
  #undef $ac_func
  
@@ -32793,7 +33180,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28169,13 +30514,15 @@
+@@ -28166,13 +30593,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32802,7 +33189,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
@@ -32813,7 +33200,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28192,32 +30539,32 @@
+@@ -28189,32 +30618,32 @@
  
  
  
@@ -32858,7 +33245,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28233,8 +30580,8 @@
+@@ -28230,8 +30659,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -32869,7 +33256,7 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28271,8 +30618,13 @@
+@@ -28268,8 +30697,13 @@
  /* end confdefs.h.  */
  #include <$x_direct_test_include>
  _ACEOF
@@ -32885,7 +33272,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28339,6 +30691,7 @@
+@@ -28336,6 +30770,7 @@
      fi
    done
  fi
@@ -32893,7 +33280,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28368,24 +30721,36 @@
+@@ -28365,24 +30800,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32938,7 +33325,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28396,7 +30761,7 @@
+@@ -28393,7 +30840,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32947,17 +33334,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}/` \
-@@ -28444,7 +30809,8 @@
+@@ -28441,7 +30888,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
  
-@@ -28454,21 +30820,26 @@
+@@ -28451,21 +30899,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -32992,7 +33379,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28476,7 +30847,7 @@
+@@ -28473,7 +30926,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
@@ -33001,7 +33388,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28485,7 +30856,7 @@
+@@ -28482,7 +30935,7 @@
      esac
    fi
    cd ..
@@ -33010,7 +33397,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28529,12 +30900,12 @@
+@@ -28526,12 +30979,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -33027,7 +33414,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28562,8 +30933,8 @@
+@@ -28559,8 +31012,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.
@@ -33038,7 +33425,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28576,40 +30947,52 @@
+@@ -28573,40 +31026,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33103,7 +33490,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28618,14 +31001,15 @@
+@@ -28615,14 +31080,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33112,7 +33499,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
@@ -33123,7 +33510,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28634,8 +31018,8 @@
+@@ -28631,8 +31097,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -33134,7 +33521,7 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28669,24 +31053,36 @@
+@@ -28666,24 +31132,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33179,7 +33566,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28695,10 +31091,11 @@
+@@ -28692,10 +31170,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33189,11 +33576,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
-@@ -28707,8 +31104,8 @@
+@@ -28704,8 +31183,8 @@
  fi
  
  
@@ -33204,7 +33591,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28854,8 +31251,8 @@
+@@ -28851,8 +31330,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33215,7 +33602,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28866,9 +31263,9 @@
+@@ -28863,9 +31342,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33228,7 +33615,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28880,40 +31277,52 @@
+@@ -28877,40 +31356,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33293,7 +33680,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28922,14 +31331,16 @@
+@@ -28919,14 +31410,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33302,7 +33689,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
@@ -33314,7 +33701,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28942,8 +31353,8 @@
+@@ -28939,8 +31432,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -33325,7 +33712,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28956,40 +31367,52 @@
+@@ -28953,40 +31446,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33390,7 +33777,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -28998,14 +31421,15 @@
+@@ -28995,14 +31500,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33399,7 +33786,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
@@ -33410,7 +33797,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29013,8 +31437,8 @@
+@@ -29010,8 +31516,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -33421,7 +33808,7 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29033,40 +31457,53 @@
+@@ -29030,40 +31536,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33484,11 +33871,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
-@@ -29081,16 +31518,15 @@
+@@ -29078,16 +31597,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -33509,7 +33896,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'
-@@ -29117,24 +31553,36 @@
+@@ -29114,24 +31632,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33554,7 +33941,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29143,8 +31591,10 @@
+@@ -29140,8 +31670,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33562,11 +33949,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
-@@ -29157,13 +31607,13 @@
+@@ -29154,13 +31686,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33584,7 +33971,7 @@
   :
  
  fi
-@@ -29175,16 +31625,15 @@
+@@ -29172,16 +31704,15 @@
      case $host_os in
   	solaris*)
  
@@ -33605,7 +33992,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'
-@@ -29211,24 +31660,36 @@
+@@ -29208,24 +31739,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33650,7 +34037,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29237,8 +31698,10 @@
+@@ -29234,8 +31777,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33658,11 +34045,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
-@@ -29251,13 +31714,13 @@
+@@ -29248,13 +31793,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33680,7 +34067,7 @@
   :
  
  fi
-@@ -29284,17 +31747,17 @@
+@@ -29281,17 +31826,17 @@
  
  
  
@@ -33704,7 +34091,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29312,21 +31775,21 @@
+@@ -29309,21 +31854,21 @@
  fi
  
  
@@ -33734,7 +34121,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29345,14 +31808,14 @@
+@@ -29342,14 +31887,14 @@
  
  
  
@@ -33753,7 +34140,7 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29386,24 +31849,36 @@
+@@ -29383,24 +31928,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33798,7 +34185,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29412,9 +31887,10 @@
+@@ -29409,9 +31966,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33807,11 +34194,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"
-@@ -29427,8 +31903,8 @@
+@@ -29424,8 +31982,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -33822,7 +34209,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29448,8 +31924,8 @@
+@@ -29445,8 +32003,8 @@
  
  
  
@@ -33833,7 +34220,7 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29485,24 +31961,36 @@
+@@ -29482,24 +32040,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33878,7 +34265,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29511,10 +31999,11 @@
+@@ -29508,10 +32078,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33888,11 +34275,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"
-@@ -29528,19 +32017,19 @@
+@@ -29525,19 +32096,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -33918,7 +34305,7 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29573,24 +32062,36 @@
+@@ -29570,24 +32141,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33963,7 +34350,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29599,9 +32100,10 @@
+@@ -29596,9 +32179,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33972,11 +34359,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"
-@@ -29611,14 +32113,14 @@
+@@ -29608,14 +32192,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -33997,7 +34384,7 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29651,24 +32153,36 @@
+@@ -29648,24 +32232,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34042,7 +34429,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -29677,9 +32191,10 @@
+@@ -29674,9 +32270,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34051,11 +34438,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"
-@@ -29689,11 +32204,11 @@
+@@ -29686,11 +32283,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34071,16 +34458,16 @@
  
         LIBJPEG=
  
-@@ -29713,7 +32228,7 @@
+@@ -29710,7 +32307,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29716: $i/$j" >&5
-+    echo "configure: 32231: $i/$j" >&5
+-    echo "configure: 29713: $i/$j" >&5
++    echo "configure: 32310: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29760,14 +32275,14 @@
+@@ -29757,14 +32354,14 @@
  
  
  
@@ -34098,7 +34485,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29810,8 +32325,8 @@
+@@ -29807,8 +32404,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34109,7 +34496,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29820,8 +32335,8 @@
+@@ -29817,8 +32414,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34120,7 +34507,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29835,10 +32350,9 @@
+@@ -29832,10 +32429,9 @@
  
  
  
@@ -34133,7 +34520,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29848,7 +32362,8 @@
+@@ -29845,7 +32441,8 @@
      fi
  
  
@@ -34143,7 +34530,7 @@
  
  USING_QT_MT=""
  
-@@ -29868,13 +32383,13 @@
+@@ -29865,13 +32462,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -34161,7 +34548,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29946,8 +32461,8 @@
+@@ -29943,8 +32540,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -34172,7 +34559,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"
-@@ -29956,34 +32471,34 @@
+@@ -29953,34 +32550,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -34219,16 +34606,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30011,7 +32526,7 @@
+@@ -30008,7 +32605,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 30014: $i/$j" >&5
-+    echo "configure: 32529: $i/$j" >&5
+-    echo "configure: 30011: $i/$j" >&5
++    echo "configure: 32608: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30048,8 +32563,7 @@
+@@ -30045,8 +32642,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -34238,7 +34625,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'
-@@ -30186,13 +32700,13 @@
+@@ -30183,13 +32779,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -34256,7 +34643,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30201,15 +32715,14 @@
+@@ -30198,15 +32794,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -34275,7 +34662,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'
-@@ -30330,12 +32843,12 @@
+@@ -30327,12 +32922,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -34292,7 +34679,7 @@
  
  fi
  
-@@ -30373,14 +32886,14 @@
+@@ -30370,14 +32965,14 @@
     fi
  
  
@@ -34310,7 +34697,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30423,8 +32936,8 @@
+@@ -30420,8 +33015,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34321,7 +34708,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30445,22 +32958,22 @@
+@@ -30442,22 +33037,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34349,7 +34736,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30503,12 +33016,12 @@
+@@ -30500,12 +33095,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34366,7 +34753,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30538,10 +33051,10 @@
+@@ -30535,10 +33130,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -34380,7 +34767,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30564,22 +33077,22 @@
+@@ -30561,22 +33156,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34410,7 +34797,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30602,13 +33115,13 @@
+@@ -30599,13 +33194,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34428,7 +34815,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30639,15 +33152,14 @@
+@@ -30636,15 +33231,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -34447,7 +34834,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'
-@@ -30680,24 +33192,36 @@
+@@ -30677,24 +33271,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34492,7 +34879,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -30706,9 +33230,10 @@
+@@ -30703,9 +33309,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34501,11 +34888,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"
-@@ -30724,12 +33249,12 @@
+@@ -30721,12 +33328,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34522,7 +34909,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30760,15 +33285,15 @@
+@@ -30757,15 +33364,15 @@
  
  
  
@@ -34544,7 +34931,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30792,11 +33317,11 @@
+@@ -30789,11 +33396,11 @@
  
  
  
@@ -34560,34 +34947,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30848,7 +33373,7 @@
+@@ -30845,7 +33452,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30851: $i/$j" >&5
-+    echo "configure: 33376: $i/$j" >&5
+-    echo "configure: 30848: $i/$j" >&5
++    echo "configure: 33455: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30878,7 +33403,7 @@
+@@ -30875,7 +33482,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30881: $i/$j" >&5
-+    echo "configure: 33406: $i/$j" >&5
+-    echo "configure: 30878: $i/$j" >&5
++    echo "configure: 33485: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30896,7 +33421,7 @@
+@@ -30893,7 +33500,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30899: $i/$j" >&5
-+    echo "configure: 33424: $i/$j" >&5
+-    echo "configure: 30896: $i/$j" >&5
++    echo "configure: 33503: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30955,12 +33480,12 @@
+@@ -30952,12 +33559,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34604,7 +34991,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30969,8 +33494,8 @@
+@@ -30966,8 +33573,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34615,7 +35002,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -31008,8 +33533,8 @@
+@@ -31005,8 +33612,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -34626,7 +35013,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31052,8 +33577,8 @@
+@@ -31049,8 +33656,8 @@
  fi
  
  
@@ -34637,7 +35024,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31085,10 +33610,9 @@
+@@ -31082,10 +33689,9 @@
  
  
  
@@ -34650,7 +35037,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31102,13 +33626,14 @@
+@@ -31099,13 +33705,14 @@
    fi
  
  
@@ -34668,7 +35055,7 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31219,15 +33744,14 @@
+@@ -31216,15 +33823,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -34689,7 +35076,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'
-@@ -31279,8 +33803,8 @@
+@@ -31276,8 +33882,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -34700,7 +35087,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.
-@@ -31319,8 +33843,8 @@
+@@ -31316,8 +33922,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -34711,7 +35098,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
-@@ -31328,8 +33852,8 @@
+@@ -31325,8 +33931,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -34722,7 +35109,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
-@@ -31522,15 +34046,14 @@
+@@ -31519,15 +34125,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -34743,7 +35130,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'
-@@ -31582,8 +34105,8 @@
+@@ -31579,8 +34184,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -34754,7 +35141,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.
-@@ -31622,8 +34145,8 @@
+@@ -31619,8 +34224,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -34765,7 +35152,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
-@@ -31631,8 +34154,8 @@
+@@ -31628,8 +34233,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -34776,7 +35163,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
-@@ -31724,22 +34247,22 @@
+@@ -31721,22 +34326,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -34805,7 +35192,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31772,14 +34295,14 @@
+@@ -31769,14 +34374,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -34823,7 +35210,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31822,8 +34345,8 @@
+@@ -31819,8 +34424,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34834,7 +35221,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31834,21 +34357,21 @@
+@@ -31831,21 +34436,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34861,7 +35248,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31891,8 +34414,8 @@
+@@ -31888,8 +34493,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34872,7 +35259,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31903,22 +34426,22 @@
+@@ -31900,22 +34505,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34900,7 +35287,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31961,8 +34484,8 @@
+@@ -31958,8 +34563,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34911,7 +35298,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -31975,21 +34498,21 @@
+@@ -31972,21 +34577,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34938,7 +35325,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32032,8 +34555,8 @@
+@@ -32029,8 +34634,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34949,7 +35336,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32046,22 +34569,22 @@
+@@ -32043,22 +34648,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34977,7 +35364,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32104,12 +34627,12 @@
+@@ -32101,12 +34706,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34994,7 +35381,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32138,14 +34661,14 @@
+@@ -32135,14 +34740,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -35012,7 +35399,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32188,8 +34711,8 @@
+@@ -32185,8 +34790,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35023,7 +35410,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32200,21 +34723,21 @@
+@@ -32197,21 +34802,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35050,7 +35437,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32257,8 +34780,8 @@
+@@ -32254,8 +34859,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35061,7 +35448,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32269,8 +34792,8 @@
+@@ -32266,8 +34871,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35072,7 +35459,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32278,14 +34801,14 @@
+@@ -32275,14 +34880,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -35090,7 +35477,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32328,8 +34851,8 @@
+@@ -32325,8 +34930,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35101,7 +35488,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32340,8 +34863,8 @@
+@@ -32337,8 +34942,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35112,7 +35499,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32349,14 +34872,14 @@
+@@ -32346,14 +34951,14 @@
  
          fi
  
@@ -35130,7 +35517,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32399,12 +34922,12 @@
+@@ -32396,12 +35001,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35147,16 +35534,16 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32419,7 +34942,7 @@
+@@ -32416,7 +35021,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32422: $i/$j" >&5
-+    echo "configure: 34945: $i/$j" >&5
+-    echo "configure: 32419: $i/$j" >&5
++    echo "configure: 35024: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32580,13 +35103,12 @@
+@@ -32577,13 +35182,12 @@
  
  
  
@@ -35173,7 +35560,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'
-@@ -32607,13 +35129,13 @@
+@@ -32604,13 +35208,13 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "GCC visibility push" >/dev/null 2>&1; then
  
@@ -35191,7 +35578,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
-@@ -32633,16 +35155,15 @@
+@@ -32630,16 +35234,15 @@
  
      kde_have_gcc_visibility=no
  
@@ -35212,7 +35599,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'
-@@ -32669,24 +35190,36 @@
+@@ -32666,24 +35269,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35257,7 +35644,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -32695,8 +35228,10 @@
+@@ -32692,8 +35307,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35265,11 +35652,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
-@@ -32709,28 +35244,27 @@
+@@ -32706,28 +35323,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35307,7 +35694,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'
-@@ -32765,24 +35299,36 @@
+@@ -32762,24 +35378,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35352,7 +35739,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -32791,9 +35337,10 @@
+@@ -32788,9 +35416,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35365,7 +35752,7 @@
  
            CXXFLAGS=$safe_CXXFLAGS
            ac_ext=c
-@@ -32805,21 +35352,20 @@
+@@ -32802,21 +35431,20 @@
  
  
  fi
@@ -35392,7 +35779,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'
-@@ -32859,24 +35405,36 @@
+@@ -32856,24 +35484,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35437,7 +35824,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -32885,9 +35443,10 @@
+@@ -32882,9 +35522,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35446,11 +35833,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
-@@ -32901,8 +35460,8 @@
+@@ -32898,8 +35539,8 @@
  
  
  fi
@@ -35461,7 +35848,7 @@
  
      if test x$kde_cv_val_gcc_visibility_bug = xno; then
        CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32918,8 +35477,8 @@
+@@ -32915,8 +35556,8 @@
        fi
  
  else
@@ -35472,7 +35859,7 @@
   :
  
  fi
-@@ -32928,15 +35487,14 @@
+@@ -32925,15 +35566,14 @@
  
  
  
@@ -35491,7 +35878,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'
-@@ -32948,9 +35506,6 @@
+@@ -32945,9 +35585,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -35501,7 +35888,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -32973,24 +35528,36 @@
+@@ -32970,24 +35607,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35546,7 +35933,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -32999,9 +35566,10 @@
+@@ -32996,9 +35645,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35559,7 +35946,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33014,11 +35582,11 @@
+@@ -33011,11 +35661,11 @@
  fi
  
  
@@ -35575,7 +35962,7 @@
  if test "${kde_cv_proto_setenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33039,8 +35607,7 @@
+@@ -33036,8 +35686,7 @@
  if test "x$kde_cv_proto_setenv" = xunknown; then
  
  
@@ -35585,7 +35972,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'
-@@ -33075,24 +35642,36 @@
+@@ -33072,24 +35721,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35630,7 +36017,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33102,10 +35681,11 @@
+@@ -33099,10 +35760,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35640,11 +36027,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
-@@ -33118,8 +35698,8 @@
+@@ -33115,8 +35777,8 @@
  
  fi
  
@@ -35655,7 +36042,7 @@
  
  if test "x$kde_cv_func_setenv" = xyes; then
  
-@@ -33143,15 +35723,14 @@
+@@ -33140,15 +35802,14 @@
  
  
  
@@ -35674,7 +36061,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'
-@@ -33163,9 +35742,6 @@
+@@ -33160,9 +35821,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -35684,7 +36071,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33188,24 +35764,36 @@
+@@ -33185,24 +35843,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35729,7 +36116,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33214,9 +35802,10 @@
+@@ -33211,9 +35881,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35742,7 +36129,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33229,11 +35818,11 @@
+@@ -33226,11 +35897,11 @@
  fi
  
  
@@ -35758,7 +36145,7 @@
  if test "${kde_cv_proto_unsetenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33254,8 +35843,7 @@
+@@ -33251,8 +35922,7 @@
  if test "x$kde_cv_proto_unsetenv" = xunknown; then
  
  
@@ -35768,7 +36155,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'
-@@ -33290,24 +35878,36 @@
+@@ -33287,24 +35957,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35813,7 +36200,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33317,10 +35917,11 @@
+@@ -33314,10 +35996,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35823,11 +36210,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
-@@ -33333,8 +35934,8 @@
+@@ -33330,8 +36013,8 @@
  
  fi
  
@@ -35838,7 +36225,7 @@
  
  if test "x$kde_cv_func_unsetenv" = xyes; then
  
-@@ -33364,18 +35965,19 @@
+@@ -33361,18 +36044,19 @@
  for ac_header in sys/stropts.h stropts.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35866,7 +36253,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33386,24 +35988,36 @@
+@@ -33383,24 +36067,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35911,7 +36298,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33412,15 +36026,16 @@
+@@ -33409,15 +36105,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35934,7 +36321,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33429,8 +36044,13 @@
+@@ -33426,8 +36123,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -35950,7 +36337,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33454,9 +36074,10 @@
+@@ -33451,9 +36153,10 @@
  
    ac_header_preproc=no
  fi
@@ -35963,7 +36350,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33480,25 +36101,19 @@
+@@ -33477,25 +36180,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;}
@@ -35996,7 +36383,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33514,18 +36129,19 @@
+@@ -33511,18 +36208,19 @@
  for ac_header in sys/time.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36024,7 +36411,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33536,24 +36152,36 @@
+@@ -33533,24 +36231,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36069,7 +36456,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33562,15 +36190,16 @@
+@@ -33559,15 +36269,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36092,7 +36479,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33579,8 +36208,13 @@
+@@ -33576,8 +36287,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -36108,7 +36495,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33604,9 +36238,10 @@
+@@ -33601,9 +36317,10 @@
  
    ac_header_preproc=no
  fi
@@ -36121,7 +36508,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33630,25 +36265,19 @@
+@@ -33627,25 +36344,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;}
@@ -36154,7 +36541,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33660,8 +36289,8 @@
+@@ -33657,8 +36368,8 @@
  
  done
  
@@ -36165,7 +36552,7 @@
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33685,24 +36314,36 @@
+@@ -33682,24 +36393,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36210,7 +36597,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33711,12 +36352,13 @@
+@@ -33708,12 +36431,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36228,7 +36615,7 @@
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -33727,8 +36369,7 @@
+@@ -33724,8 +36448,7 @@
  
  
  
@@ -36238,7 +36625,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'
-@@ -33741,18 +36382,19 @@
+@@ -33738,18 +36461,19 @@
  for ac_header in sstream
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36266,7 +36653,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33763,24 +36405,36 @@
+@@ -33760,24 +36484,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36311,7 +36698,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33789,15 +36443,16 @@
+@@ -33786,15 +36522,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36334,7 +36721,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33806,8 +36461,13 @@
+@@ -33803,8 +36540,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -36350,7 +36737,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33831,9 +36491,10 @@
+@@ -33828,9 +36570,10 @@
  
    ac_header_preproc=no
  fi
@@ -36363,7 +36750,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33857,25 +36518,19 @@
+@@ -33854,25 +36597,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;}
@@ -36396,7 +36783,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33894,8 +36549,8 @@
+@@ -33891,8 +36628,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -36407,7 +36794,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -33918,39 +36573,52 @@
+@@ -33915,39 +36652,52 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36474,7 +36861,7 @@
  
  
  
-@@ -33967,15 +36635,15 @@
+@@ -33964,15 +36714,15 @@
  
  echo "Backend configured."
  
@@ -36494,7 +36881,7 @@
  if test "$ksysv_compile" = "no"; then
    DO_NOT_COMPILE="$DO_NOT_COMPILE ksysv"
  fi
-@@ -33988,10 +36656,9 @@
+@@ -33985,10 +36735,9 @@
  
    want_pam=
  
@@ -36507,7 +36894,7 @@
          want_pam=yes
          pam_service=kde
        elif test "x$withval" = "xno"; then
-@@ -34003,13 +36670,14 @@
+@@ -34000,13 +36749,14 @@
  
  else
     pam_service=kde
@@ -36525,7 +36912,7 @@
  if test "${ac_cv_lib_pam_pam_start+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34022,40 +36690,52 @@
+@@ -34019,40 +36769,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -36590,7 +36977,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34064,28 +36744,29 @@
+@@ -34061,28 +36823,29 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36599,7 +36986,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
@@ -36630,7 +37017,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34096,24 +36777,36 @@
+@@ -34093,24 +36856,36 @@
  #include <security/pam_appl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36675,7 +37062,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34122,15 +36815,16 @@
+@@ -34119,15 +36894,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36698,7 +37085,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34139,8 +36833,13 @@
+@@ -34136,8 +36912,13 @@
  /* end confdefs.h.  */
  #include <security/pam_appl.h>
  _ACEOF
@@ -36714,7 +37101,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -34164,9 +36863,10 @@
+@@ -34161,9 +36942,10 @@
  
    ac_header_preproc=no
  fi
@@ -36727,7 +37114,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34190,42 +36890,35 @@
+@@ -34187,42 +36969,35 @@
  echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -36781,7 +37168,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34236,24 +36929,36 @@
+@@ -34233,24 +37008,36 @@
  #include <pam/pam_appl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36826,7 +37213,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34262,15 +36967,16 @@
+@@ -34259,15 +37046,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36849,7 +37236,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34279,8 +36985,13 @@
+@@ -34276,8 +37064,13 @@
  /* end confdefs.h.  */
  #include <pam/pam_appl.h>
  _ACEOF
@@ -36865,7 +37252,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -34304,9 +37015,10 @@
+@@ -34301,9 +37094,10 @@
  
    ac_header_preproc=no
  fi
@@ -36878,7 +37265,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34330,25 +37042,18 @@
+@@ -34327,25 +37121,18 @@
  echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -36909,7 +37296,7 @@
  
  fi
  if test $ac_cv_header_pam_pam_appl_h = yes; then
-@@ -34395,8 +37100,8 @@
+@@ -34392,8 +37179,8 @@
  
        fi
  
@@ -36920,7 +37307,7 @@
        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34419,11 +37124,11 @@
+@@ -34416,11 +37203,11 @@
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "const struct pam_message" >/dev/null 2>&1; then
@@ -36936,7 +37323,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define PAM_MESSAGE_NONCONST 1
-@@ -34434,8 +37139,8 @@
+@@ -34431,8 +37218,8 @@
  rm -f conftest*
  
  else
@@ -36947,7 +37334,7 @@
  fi
  rm -f conftest*
  
-@@ -34447,8 +37152,8 @@
+@@ -34444,8 +37231,8 @@
  
  
  
@@ -36958,7 +37345,7 @@
  if test "${ac_cv_lib_shadow_getspent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34461,40 +37166,52 @@
+@@ -34458,40 +37245,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37023,7 +37410,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34503,21 +37220,22 @@
+@@ -34500,21 +37299,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37032,7 +37419,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
@@ -37052,7 +37439,7 @@
  if test "${ac_cv_lib_gen_getspent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34530,40 +37248,52 @@
+@@ -34527,40 +37327,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37117,7 +37504,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34572,21 +37302,22 @@
+@@ -34569,21 +37381,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37126,7 +37513,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
@@ -37146,7 +37533,7 @@
  if test "${ac_cv_func_getspent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34613,53 +37344,59 @@
+@@ -34610,53 +37423,59 @@
  
  #undef getspent
  
@@ -37225,7 +37612,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34668,13 +37405,14 @@
+@@ -34665,13 +37484,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37234,7 +37621,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_getspent" >&5
@@ -37244,7 +37631,7 @@
  if test $ac_cv_func_getspent = yes; then
     ac_use_shadow=yes
  else
-@@ -34690,14 +37428,13 @@
+@@ -34687,14 +37507,13 @@
  
  
  
@@ -37263,7 +37650,7 @@
          use_shadow=yes
        else
          use_shadow=no
-@@ -34707,19 +37444,20 @@
+@@ -34704,19 +37523,20 @@
  
        use_shadow="$ac_use_shadow"
  
@@ -37289,7 +37676,7 @@
      LIBSHADOW=
      LIBGEN=
    fi
-@@ -34747,9 +37485,9 @@
+@@ -34744,9 +37564,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -37302,7 +37689,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -34771,24 +37509,36 @@
+@@ -34768,24 +37588,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37347,7 +37734,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34797,12 +37547,14 @@
+@@ -34794,12 +37626,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37366,7 +37753,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -34814,13 +37566,12 @@
+@@ -34811,13 +37645,12 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -37382,7 +37769,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34828,126 +37579,99 @@
+@@ -34825,126 +37658,99 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37518,7 +37905,7 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 +fi
  
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
@@ -37560,7 +37947,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34955,122 +37679,96 @@
+@@ -34952,122 +37758,96 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37700,7 +38087,7 @@
 -      conftest$ac_exeext conftest.$ac_ext
 -  done
 +
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
@@ -37735,7 +38122,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35094,24 +37792,36 @@
+@@ -35091,24 +37871,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37780,7 +38167,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35120,9 +37830,10 @@
+@@ -35117,9 +37909,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37793,7 +38180,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -35178,6 +37889,7 @@
+@@ -35175,6 +37968,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -37801,7 +38188,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -35197,18 +37909,27 @@
+@@ -35194,18 +37988,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -37835,7 +38222,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35221,12 +37942,14 @@
+@@ -35218,12 +38021,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -37853,7 +38240,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35258,18 +37981,19 @@
+@@ -35255,18 +38060,19 @@
                   signal.h sys/mount.h sys/fcntl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37881,7 +38268,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35280,24 +38004,36 @@
+@@ -35277,24 +38083,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37926,7 +38313,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35306,15 +38042,16 @@
+@@ -35303,15 +38121,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37949,7 +38336,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35323,8 +38060,13 @@
+@@ -35320,8 +38139,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -37965,7 +38352,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -35348,9 +38090,10 @@
+@@ -35345,9 +38169,10 @@
  
    ac_header_preproc=no
  fi
@@ -37978,7 +38365,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -35374,25 +38117,19 @@
+@@ -35371,25 +38196,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;}
@@ -38011,7 +38398,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -35421,13 +38158,13 @@
+@@ -35418,13 +38237,13 @@
  esac
  
  
@@ -38029,7 +38416,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KU_HOMETEMPLATE "$ku_hometemplate"
-@@ -35435,13 +38172,13 @@
+@@ -35432,13 +38251,13 @@
  
  
  
@@ -38047,7 +38434,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KU_FIRSTUID $ku_firstuid
-@@ -35450,13 +38187,13 @@
+@@ -35447,13 +38266,13 @@
  
  
  
@@ -38065,7 +38452,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KU_FIRSTGID $ku_firstgid
-@@ -35465,13 +38202,13 @@
+@@ -35462,13 +38281,13 @@
  
  
  
@@ -38083,7 +38470,7 @@
  if test "$ku_userprivategroup" = "yes"; then
    ku_userprivategroup="true"
  else
-@@ -35484,13 +38221,13 @@
+@@ -35481,13 +38300,13 @@
  
  
  
@@ -38101,7 +38488,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KU_HOMEDIR_PERM $ku_homedir_perm
-@@ -35499,13 +38236,13 @@
+@@ -35496,13 +38315,13 @@
  
  
  
@@ -38119,7 +38506,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KU_MAILBOX_PERM $ku_mailbox_perm
-@@ -35514,13 +38251,13 @@
+@@ -35511,13 +38330,13 @@
  
  
  
@@ -38137,7 +38524,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KU_MAILBOX_GID $ku_mailbox_gid
-@@ -35529,15 +38266,14 @@
+@@ -35526,15 +38345,14 @@
  
  
  
@@ -38156,7 +38543,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'
-@@ -35549,9 +38285,6 @@
+@@ -35546,9 +38364,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -38166,7 +38553,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35572,24 +38305,36 @@
+@@ -35569,24 +38384,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38211,7 +38598,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35598,9 +38343,10 @@
+@@ -35595,9 +38422,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38224,7 +38611,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -35613,11 +38359,11 @@
+@@ -35610,11 +38438,11 @@
  fi
  
  
@@ -38240,7 +38627,7 @@
  if test "${kde_cv_proto_fgetpwent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35638,8 +38384,7 @@
+@@ -35635,8 +38463,7 @@
  if test "x$kde_cv_proto_fgetpwent" = xunknown; then
  
  
@@ -38250,7 +38637,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'
-@@ -35672,24 +38417,36 @@
+@@ -35669,24 +38496,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38295,7 +38682,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35699,10 +38456,11 @@
+@@ -35696,10 +38535,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38305,11 +38692,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
-@@ -35715,8 +38473,8 @@
+@@ -35712,8 +38552,8 @@
  
  fi
  
@@ -38320,7 +38707,7 @@
  
  if test "x$kde_cv_func_fgetpwent" = xyes; then
  
-@@ -35738,15 +38496,14 @@
+@@ -35735,15 +38575,14 @@
  
  
  
@@ -38339,7 +38726,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'
-@@ -35758,9 +38515,6 @@
+@@ -35755,9 +38594,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -38349,7 +38736,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35781,24 +38535,36 @@
+@@ -35778,24 +38614,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38394,7 +38781,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35807,9 +38573,10 @@
+@@ -35804,9 +38652,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38407,7 +38794,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -35822,11 +38589,11 @@
+@@ -35819,11 +38668,11 @@
  fi
  
  
@@ -38423,7 +38810,7 @@
  if test "${kde_cv_proto_fgetgrent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35847,8 +38614,7 @@
+@@ -35844,8 +38693,7 @@
  if test "x$kde_cv_proto_fgetgrent" = xunknown; then
  
  
@@ -38433,7 +38820,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'
-@@ -35881,24 +38647,36 @@
+@@ -35878,24 +38726,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38478,7 +38865,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35908,10 +38686,11 @@
+@@ -35905,10 +38765,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38488,11 +38875,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
-@@ -35924,8 +38703,8 @@
+@@ -35921,8 +38782,8 @@
  
  fi
  
@@ -38503,7 +38890,7 @@
  
  if test "x$kde_cv_func_fgetgrent" = xyes; then
  
-@@ -35947,15 +38726,14 @@
+@@ -35944,15 +38805,14 @@
  
  
  
@@ -38522,7 +38909,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'
-@@ -35967,9 +38745,6 @@
+@@ -35964,9 +38824,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -38532,7 +38919,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35990,24 +38765,36 @@
+@@ -35987,24 +38844,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38577,7 +38964,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36016,9 +38803,10 @@
+@@ -36013,9 +38882,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38590,7 +38977,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -36031,11 +38819,11 @@
+@@ -36028,11 +38898,11 @@
  fi
  
  
@@ -38606,7 +38993,7 @@
  if test "${kde_cv_proto_fgetspent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36056,8 +38844,7 @@
+@@ -36053,8 +38923,7 @@
  if test "x$kde_cv_proto_fgetspent" = xunknown; then
  
  
@@ -38616,7 +39003,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'
-@@ -36090,24 +38877,36 @@
+@@ -36087,24 +38956,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38661,7 +39048,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36117,10 +38916,11 @@
+@@ -36114,10 +38995,11 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38671,11 +39058,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
-@@ -36133,8 +38933,8 @@
+@@ -36130,8 +39012,8 @@
  
  fi
  
@@ -38686,7 +39073,7 @@
  
  if test "x$kde_cv_func_fgetspent" = xyes; then
  
-@@ -36157,9 +38957,8 @@
+@@ -36154,9 +39036,8 @@
  
  
  
@@ -38698,7 +39085,17 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36185,24 +38984,36 @@
+@@ -36173,7 +39054,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
+ 
+@@ -36182,24 +39064,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38743,7 +39140,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36228,24 +39039,36 @@
+@@ -36225,24 +39119,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38788,7 +39185,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36254,14 +39077,15 @@
+@@ -36251,14 +39157,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38807,7 +39204,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -36271,11 +39095,11 @@
+@@ -36268,11 +39175,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -38823,7 +39220,7 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -36286,24 +39110,36 @@
+@@ -36283,24 +39190,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38868,7 +39265,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36322,8 +39158,10 @@
+@@ -36319,8 +39238,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38880,7 +39277,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -36331,27 +39169,41 @@
+@@ -36328,27 +39249,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -38929,7 +39326,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36364,13 +39216,16 @@
+@@ -36361,13 +39296,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -38950,7 +39347,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -36396,14 +39251,14 @@
+@@ -36393,14 +39331,14 @@
  
  
  
@@ -38968,7 +39365,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -36446,14 +39301,14 @@
+@@ -36443,14 +39381,14 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38987,7 +39384,7 @@
        LILO=$kde_cv_path
  
     fi
-@@ -36485,8 +39340,8 @@
+@@ -36482,8 +39420,8 @@
  fi
  
  for i in $ac_topsubdirs; do
@@ -38998,7 +39395,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -36497,8 +39352,8 @@
+@@ -36494,8 +39432,8 @@
    else
      install_it="no"
    fi
@@ -39009,7 +39406,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -36610,109 +39465,109 @@
+@@ -36607,109 +39545,109 @@
    secpolicy_SUBDIR_included_FALSE=
  fi
  
@@ -39171,7 +39568,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -36732,39 +39587,58 @@
+@@ -36729,39 +39667,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -39246,7 +39643,7 @@
    fi
  fi
  rm -f confcache
-@@ -36773,38 +39647,31 @@
+@@ -36770,38 +39727,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -39298,7 +39695,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
-@@ -36948,11 +39815,35 @@
+@@ -36945,11 +39895,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -39336,7 +39733,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -36961,8 +39852,43 @@
+@@ -36958,8 +39932,43 @@
  fi
  
  
@@ -39381,7 +39778,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -36976,18 +39902,19 @@
+@@ -36973,18 +39982,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -39404,7 +39801,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -36995,159 +39922,120 @@
+@@ -36992,159 +40002,120 @@
  
  
  # Name of the executable.
@@ -39635,7 +40032,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -37156,7 +40044,19 @@
+@@ -37153,7 +40124,19 @@
    as_mkdir_p=false
  fi
  
@@ -39656,7 +40053,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'"
-@@ -37165,31 +40065,14 @@
+@@ -37162,31 +40145,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -39688,11 +40085,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
-@@ -37197,30 +40080,20 @@
+@@ -37194,30 +40160,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -39731,7 +40128,16 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -37247,19 +40120,21 @@
+@@ -37225,7 +40181,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
+@@ -37244,19 +40200,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -39743,7 +40149,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.
@@ -39759,7 +40165,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -37270,39 +40145,24 @@
+@@ -37267,39 +40225,24 @@
  do
    case $1 in
    --*=*)
@@ -39805,7 +40211,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -37312,18 +40172,24 @@
+@@ -37309,18 +40252,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -39835,7 +40241,7 @@
  
    esac
    shift
-@@ -37339,88 +40205,100 @@
+@@ -37336,88 +40285,100 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -39998,7 +40404,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
-@@ -37432,523 +40310,674 @@
+@@ -37429,523 +40390,674 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -41135,7 +41541,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -37956,248 +40985,130 @@
+@@ -37953,248 +41065,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -41484,7 +41890,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -38208,135 +41119,39 @@
+@@ -38205,135 +41199,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -41646,7 +42052,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.
-@@ -38346,18 +41161,29 @@
+@@ -38343,18 +41241,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
@@ -41684,7 +42090,7 @@
    else
      continue
    fi
-@@ -38379,53 +41205,79 @@
+@@ -38376,53 +41285,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -41797,7 +42203,7 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeadmin, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeadmin, "3.5.5") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -44007,8 +44413,8 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=suse.png openna.png kubuntu.png vine.png turbolinux.png ark.png blackpanther.png gentoo.png yoper.png debian.png hi22-action-network_connected_lan_knc.png hi22-action-network_disconnected_lan.png hi22-action-network_traffic_wlan.png mandrake.png rpath.png freebsd.png slackware.png redhat.png fedora.png Makefile.in hi22-action-network_disconnected_wlan.png conectiva.png Makefile.am pld.png 
-+KDE_DIST=suse.png openna.png kubuntu.png vine.png turbolinux.png ark.png blackpanther.png gentoo.png yoper.png debian.png hi22-action-network_connected_lan_knc.png hi22-action-network_disconnected_lan.png hi22-action-network_traffic_wlan.png mandrake.png rpath.png freebsd.png slackware.png redhat.png fedora.png Makefile.in hi22-action-network_disconnected_wlan.png conectiva.png pld.png Makefile.am 
+-KDE_DIST=suse.png openna.png kubuntu.png vine.png turbolinux.png ark.png blackpanther.png gentoo.png yoper.png debian.png hi22-action-network_connected_lan_knc.png hi22-action-network_disconnected_lan.png hi22-action-network_traffic_wlan.png mandriva.png rpath.png freebsd.png slackware.png redhat.png fedora.png Makefile.in hi22-action-network_disconnected_wlan.png conectiva.png Makefile.am pld.png 
++KDE_DIST=suse.png openna.png kubuntu.png vine.png turbolinux.png ark.png blackpanther.png gentoo.png yoper.png debian.png hi22-action-network_connected_lan_knc.png hi22-action-network_disconnected_lan.png hi22-action-network_traffic_wlan.png mandriva.png rpath.png freebsd.png slackware.png redhat.png fedora.png Makefile.in hi22-action-network_disconnected_wlan.png conectiva.png pld.png Makefile.am 
  
  #>+ 2
  docs-am:
@@ -46201,8 +46607,8 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
+-KDE_DIST=COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in kdeadmin.lsm Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:




More information about the pkg-kde-commits mailing list