[Pkg-kde-commits] rev 2445 - trunk/packages/kdeutils/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Wed Nov 30 16:10:06 UTC 2005


Author: chrsmrtn
Date: 2005-11-30 16:09:59 +0000 (Wed, 30 Nov 2005)
New Revision: 2445

Modified:
   trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
kdeutils buildprep update.


Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/98_buildprep.diff	2005-11-30 13:45:54 UTC (rev 2444)
+++ trunk/packages/kdeutils/debian/patches/98_buildprep.diff	2005-11-30 16:09:59 UTC (rev 2445)
@@ -28,128 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -3351,63 +3339,63 @@
- 
- AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
- [
--  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
--
--  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
--
--  if test "x$GXX" = "xyes"; then
--    AC_LANG_SAVE
--    AC_LANG_CPLUSPLUS
--    AC_EGREP_CPP(
--       [GCC visibility push],
--       [ #include <exception> 
--       ], 
--    [
--      AC_MSG_RESULT(yes)
--      kde_stdc_visibility_patched=yes ],
--    [ 
--      AC_MSG_RESULT(no)
--      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
--                   visibility support. Disabling -fvisibility=hidden])
--
--      kde_stdc_visibility_patched=no ])
--    AC_LANG_RESTORE
--
--    kde_have_gcc_visibility=no
--    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
--    [
--      kde_have_gcc_visibility=yes
--      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
--        [
--          AC_LANG_SAVE
--          AC_LANG_CPLUSPLUS
--
--          safe_CXXFLAGS=$CXXFLAGS
--          CXXFLAGS="$CXXFLAGS $all_includes"
--
--          AC_TRY_COMPILE(
--          [
--#include <qglobal.h>
--#if Q_EXPORT - 0 != 0
--/* if this compiles, then Q_EXPORT is undefined */
--/* if Q_EXPORT is nonempty, this will break compilation */
--#endif
--          ], [/* elvis is alive */],
--          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
--
--          CXXFLAGS=$safe_CXXFLAGS
--          AC_LANG_RESTORE
--        ]
--      )
--
--      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--        KDE_CHECK_VISIBILITY_GCC_BUG
--        HAVE_GCC_VISIBILITY=1
--        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
--      fi
--    ])
--  fi
-+dnl  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
-+dnl
-+dnl  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
-+dnl
-+dnl  if test "x$GXX" = "xyes"; then
-+dnl    AC_LANG_SAVE
-+dnl    AC_LANG_CPLUSPLUS
-+dnl    AC_EGREP_CPP(
-+dnl       [GCC visibility push],
-+dnl       [ #include <exception> 
-+dnl       ], 
-+dnl    [
-+dnl      AC_MSG_RESULT(yes)
-+dnl      kde_stdc_visibility_patched=yes ],
-+dnl    [ 
-+dnl      AC_MSG_RESULT(no)
-+dnl      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
-+dnl                   visibility support. Disabling -fvisibility=hidden])
-+dnl
-+dnl      kde_stdc_visibility_patched=no ])
-+dnl    AC_LANG_RESTORE
-+dnl
-+dnl    kde_have_gcc_visibility=no
-+dnl    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-+dnl    [
-+dnl      kde_have_gcc_visibility=yes
-+dnl      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
-+dnl        [
-+dnl          AC_LANG_SAVE
-+dnl          AC_LANG_CPLUSPLUS
-+dnl
-+dnl          safe_CXXFLAGS=$CXXFLAGS
-+dnl          CXXFLAGS="$CXXFLAGS $all_includes"
-+dnl
-+dnl          AC_TRY_COMPILE(
-+dnl          [
-+dnl#include <qglobal.h>
-+dnl#if Q_EXPORT - 0 != 0
-+dnl/* if this compiles, then Q_EXPORT is undefined */
-+dnl/* if Q_EXPORT is nonempty, this will break compilation */
-+dnl#endif
-+dnl          ], [/* elvis is alive */],
-+dnl          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-+dnl
-+dnl          CXXFLAGS=$safe_CXXFLAGS
-+dnl          AC_LANG_RESTORE
-+dnl        ]
-+dnl      )
-+dnl
-+dnl      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
-+dnl        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+dnl        KDE_CHECK_VISIBILITY_GCC_BUG
-+dnl        HAVE_GCC_VISIBILITY=1
-+dnl        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-+dnl      fi
-+dnl    ])
-+dnl  fi
- ])
- 
- AC_DEFUN([KDE_ADD_DEPENDENCIES],
-@@ -5907,30 +5895,15 @@
+@@ -5917,30 +5905,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -185,7 +64,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5990,7 +5963,7 @@
+@@ -6000,7 +5973,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -194,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6040,7 +6013,7 @@
+@@ -6050,7 +6023,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -203,7 +82,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6060,7 +6033,7 @@
+@@ -6070,7 +6043,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -212,7 +91,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6108,6 +6081,8 @@
+@@ -6118,6 +6091,8 @@
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -221,7 +100,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6153,6 +6128,48 @@
+@@ -6163,6 +6138,48 @@
  ])# _LT_AC_SYS_COMPILER
  
  
@@ -270,7 +149,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6225,15 +6242,15 @@
+@@ -6235,15 +6252,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -289,7 +168,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6402,14 +6419,13 @@
+@@ -6412,14 +6429,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -306,7 +185,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6421,7 +6437,6 @@
+@@ -6431,7 +6447,6 @@
        esac
        ;;
      *64-bit*)
@@ -314,7 +193,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6486,7 +6501,7 @@
+@@ -6496,7 +6511,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 \
@@ -323,7 +202,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6496,8 +6511,10 @@
+@@ -6506,8 +6521,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
@@ -336,7 +215,7 @@
         $2=yes
       fi
     fi
-@@ -6523,11 +6540,16 @@
+@@ -6533,11 +6550,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
@@ -354,7 +233,7 @@
       else
         $2=yes
       fi
-@@ -6551,7 +6573,7 @@
+@@ -6561,7 +6583,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -363,7 +242,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6580,20 +6602,53 @@
+@@ -6590,20 +6612,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -423,7 +302,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.
-@@ -6689,7 +6744,7 @@
+@@ -6699,7 +6754,7 @@
  }]
  EOF
    if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -432,7 +311,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) $1 ;;
-@@ -6743,7 +6798,7 @@
+@@ -6753,7 +6808,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -441,7 +320,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6832,20 +6887,13 @@
+@@ -6842,20 +6897,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -463,7 +342,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6857,13 +6905,18 @@
+@@ -6867,13 +6915,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -486,7 +365,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6922,8 +6975,8 @@
+@@ -6932,8 +6985,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)" || \
@@ -497,7 +376,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -6980,7 +7033,7 @@
+@@ -6990,7 +7043,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -506,7 +385,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6993,7 +7046,7 @@
+@@ -7003,7 +7056,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -515,7 +394,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7003,7 +7056,20 @@
+@@ -7013,7 +7066,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -537,7 +416,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7068,7 +7134,7 @@
+@@ -7078,7 +7144,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -546,7 +425,7 @@
    ;;
  
  beos*)
-@@ -7077,7 +7143,7 @@
+@@ -7087,7 +7153,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -555,7 +434,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7093,7 +7159,7 @@
+@@ -7103,7 +7169,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -564,7 +443,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7105,7 +7171,8 @@
+@@ -7115,7 +7181,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -574,7 +453,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7135,7 +7202,7 @@
+@@ -7145,7 +7212,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -583,7 +462,7 @@
        ;;
      esac
      ;;
-@@ -7158,7 +7225,7 @@
+@@ -7168,7 +7235,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -592,7 +471,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"`
-@@ -7181,7 +7248,7 @@
+@@ -7191,7 +7258,7 @@
    dynamic_linker=no
    ;;
  
@@ -601,7 +480,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7193,8 +7260,17 @@
+@@ -7203,8 +7270,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -621,7 +500,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7212,7 +7288,7 @@
+@@ -7222,7 +7298,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -630,7 +509,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -7239,9 +7315,9 @@
+@@ -7249,9 +7325,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -642,7 +521,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7256,7 +7332,7 @@
+@@ -7266,7 +7342,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -651,7 +530,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7267,7 +7343,7 @@
+@@ -7277,7 +7353,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -660,7 +539,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7329,22 +7405,19 @@
+@@ -7339,22 +7415,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -689,7 +568,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,
-@@ -7354,6 +7427,30 @@
+@@ -7364,6 +7437,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -720,7 +599,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7363,7 +7460,7 @@
+@@ -7373,7 +7470,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -729,7 +608,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7392,7 +7489,11 @@
+@@ -7402,7 +7499,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -742,7 +621,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
-@@ -7412,7 +7513,7 @@
+@@ -7422,7 +7523,7 @@
  
  os2*)
    libname_spec='$name'
@@ -751,7 +630,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7558,7 +7659,9 @@
+@@ -7568,7 +7669,9 @@
  
        case $tagname in
        CXX)
@@ -762,7 +641,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7620,7 +7723,7 @@
+@@ -7630,7 +7733,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -771,7 +650,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7794,7 +7897,7 @@
+@@ -7804,7 +7907,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -780,7 +659,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
-@@ -7904,7 +8007,7 @@
+@@ -7914,7 +8017,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,
@@ -789,7 +668,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'*)
-@@ -7936,7 +8039,7 @@
+@@ -7946,7 +8049,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,
@@ -798,7 +677,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7963,6 +8066,15 @@
+@@ -7973,6 +8076,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -814,7 +693,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -7996,44 +8108,36 @@
+@@ -8006,44 +8118,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -870,7 +749,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8049,7 +8153,7 @@
+@@ -8059,7 +8163,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -879,7 +758,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
-@@ -8066,42 +8170,21 @@
+@@ -8076,42 +8180,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -929,7 +808,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
-@@ -8120,19 +8203,14 @@
+@@ -8130,19 +8213,14 @@
    ;;
  
  openbsd*)
@@ -951,7 +830,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8142,7 +8220,6 @@
+@@ -8152,7 +8230,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -959,7 +838,7 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8250,13 +8327,13 @@
+@@ -8260,13 +8337,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -980,7 +859,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8275,13 +8352,13 @@
+@@ -8285,13 +8362,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1001,7 +880,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
-@@ -8319,10 +8396,21 @@
+@@ -8329,10 +8406,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1024,7 +903,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8395,6 +8483,10 @@
+@@ -8405,6 +8493,10 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1035,7 +914,7 @@
  #
  # Check for any special shared library compilation flags.
  #
-@@ -8408,7 +8500,7 @@
+@@ -8418,7 +8510,7 @@
  fi
  if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
    AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -1044,7 +923,7 @@
    else
      AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
      _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8449,7 +8541,7 @@
+@@ -8459,7 +8551,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1053,7 +932,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8458,48 +8550,11 @@
+@@ -8468,48 +8560,11 @@
    fi
    ;;
  
@@ -1104,7 +983,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8524,7 +8579,7 @@
+@@ -8534,7 +8589,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1113,7 +992,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8553,7 +8608,7 @@
+@@ -8563,7 +8618,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1122,7 +1001,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8568,6 +8623,10 @@
+@@ -8578,6 +8633,10 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1133,7 +1012,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8589,7 +8648,7 @@
+@@ -8599,7 +8658,7 @@
  CC=${CXX-"c++"}
  compiler=$CC
  _LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1142,7 +1021,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8607,8 +8666,8 @@
+@@ -8617,8 +8676,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
@@ -1153,7 +1032,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8634,7 +8693,7 @@
+@@ -8644,7 +8703,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.
@@ -1162,7 +1041,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8664,8 +8723,22 @@
+@@ -8674,8 +8733,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1187,7 +1066,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8682,7 +8755,7 @@
+@@ -8692,7 +8765,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1196,7 +1075,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`
-@@ -8703,6 +8776,9 @@
+@@ -8713,6 +8786,9 @@
  	fi
        esac
        shared_flag='-shared'
@@ -1206,7 +1085,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8711,15 +8787,16 @@
+@@ -8721,15 +8797,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1227,7 +1106,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.
-@@ -8728,13 +8805,12 @@
+@@ -8738,13 +8815,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1243,7 +1122,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8748,8 +8824,8 @@
+@@ -8758,8 +8834,8 @@
  	# Exported symbols can be pulled into shared objects from archives
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -1254,7 +1133,7 @@
        fi
      fi
      ;;
-@@ -8762,16 +8838,17 @@
+@@ -8772,16 +8848,17 @@
      esac
      ;;
  
@@ -1274,7 +1153,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
-@@ -8780,70 +8857,81 @@
+@@ -8790,70 +8867,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1408,7 +1287,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8854,14 +8942,14 @@
+@@ -8864,14 +8952,14 @@
  	;;
      esac
      ;;
@@ -1425,7 +1304,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8878,12 +8966,12 @@
+@@ -8888,12 +8976,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1441,7 +1320,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8892,11 +8980,11 @@
+@@ -8902,11 +8990,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.
@@ -1455,7 +1334,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8906,7 +8994,7 @@
+@@ -8916,7 +9004,7 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1464,7 +1343,7 @@
        hppa*64*)
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -8922,7 +9010,7 @@
+@@ -8932,7 +9020,7 @@
          ;;
        esac
      fi
@@ -1473,7 +1352,7 @@
      hppa*64*)
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8943,17 +9031,17 @@
+@@ -8953,17 +9041,17 @@
      esac
  
      case $cc_basename in
@@ -1495,7 +1374,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8969,12 +9057,12 @@
+@@ -8979,12 +9067,12 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1510,7 +1389,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -8987,9 +9075,9 @@
+@@ -8997,9 +9085,9 @@
      ;;
    irix5* | irix6*)
      case $cc_basename in
@@ -1522,7 +1401,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9000,9 +9088,9 @@
+@@ -9010,9 +9098,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1534,7 +1413,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9013,14 +9101,14 @@
+@@ -9023,14 +9111,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -1552,7 +1431,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9038,20 +9126,44 @@
+@@ -9048,20 +9136,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1603,7 +1482,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9079,7 +9191,7 @@
+@@ -9089,7 +9201,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1612,7 +1491,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9089,7 +9201,7 @@
+@@ -9099,7 +9211,7 @@
  	;;
      esac
      ;;
@@ -1621,7 +1500,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=
-@@ -9100,15 +9212,31 @@
+@@ -9110,15 +9222,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::"'
      ;;
@@ -1655,7 +1534,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9118,14 +9246,14 @@
+@@ -9128,14 +9256,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -1673,7 +1552,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9143,7 +9271,7 @@
+@@ -9153,7 +9281,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1682,7 +1561,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9162,13 +9290,13 @@
+@@ -9172,13 +9300,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -1698,7 +1577,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9177,17 +9305,17 @@
+@@ -9187,17 +9315,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -1720,7 +1599,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9206,7 +9334,7 @@
+@@ -9216,7 +9344,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1729,7 +1608,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9230,7 +9358,7 @@
+@@ -9240,7 +9368,7 @@
    sco*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case $cc_basename in
@@ -1738,7 +1617,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9242,12 +9370,12 @@
+@@ -9252,12 +9380,12 @@
      ;;
    sunos4*)
      case $cc_basename in
@@ -1753,7 +1632,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9260,36 +9388,33 @@
+@@ -9270,36 +9398,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -1802,7 +1681,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9297,9 +9422,9 @@
+@@ -9307,9 +9432,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -1814,7 +1693,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9309,9 +9434,9 @@
+@@ -9319,9 +9444,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
@@ -1826,7 +1705,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9320,9 +9445,9 @@
+@@ -9330,9 +9455,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -1838,7 +1717,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9340,7 +9465,7 @@
+@@ -9350,7 +9475,7 @@
      ;;
    tandem*)
      case $cc_basename in
@@ -1847,7 +1726,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9450,7 +9575,7 @@
+@@ -9460,7 +9585,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.
@@ -1856,7 +1735,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9490,7 +9615,7 @@
+@@ -9500,7 +9625,7 @@
         fi
         ;;
  
@@ -1865,7 +1744,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9526,6 +9651,21 @@
+@@ -9536,6 +9661,21 @@
  
  $rm -f confest.$objext
  
@@ -1887,7 +1766,7 @@
  case " $_LT_AC_TAGVAR(postdeps, $1) " in
  *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
  esac
-@@ -9576,12 +9716,16 @@
+@@ -9586,12 +9726,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1905,7 +1784,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9591,7 +9735,7 @@
+@@ -9601,7 +9745,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1914,7 +1793,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9599,8 +9743,10 @@
+@@ -9609,8 +9753,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -1927,7 +1806,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9651,20 +9797,27 @@
+@@ -9661,20 +9807,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -1956,7 +1835,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
-@@ -9711,11 +9864,16 @@
+@@ -9721,11 +9874,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1973,7 +1852,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9741,11 +9899,12 @@
+@@ -9751,11 +9909,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1988,7 +1867,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 \
-@@ -9795,7 +9954,7 @@
+@@ -9805,7 +9964,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1997,7 +1876,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9861,11 +10020,11 @@
+@@ -9871,11 +10030,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2011,7 +1890,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9896,6 +10055,12 @@
+@@ -9906,6 +10065,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2024,7 +1903,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9926,7 +10091,7 @@
+@@ -9936,7 +10101,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2033,7 +1912,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9957,7 +10122,7 @@
+@@ -9967,7 +10132,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2042,7 +1921,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -9972,7 +10137,7 @@
+@@ -9982,7 +10147,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2051,7 +1930,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10201,7 +10366,10 @@
+@@ -10211,7 +10376,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.
@@ -2063,7 +1942,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10243,9 +10411,6 @@
+@@ -10253,9 +10421,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2073,7 +1952,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'"
  
-@@ -10267,6 +10432,13 @@
+@@ -10277,6 +10442,13 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -2087,7 +1966,7 @@
  irix* | nonstopux*)
    symcode='[[BCDEGRST]]'
    ;;
-@@ -10274,7 +10446,7 @@
+@@ -10284,7 +10456,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -2096,7 +1975,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10292,14 +10464,17 @@
+@@ -10302,14 +10474,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2116,7 +1995,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10463,7 +10638,7 @@
+@@ -10473,7 +10648,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2125,7 +2004,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10488,18 +10663,28 @@
+@@ -10498,18 +10673,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2157,7 +2036,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10507,22 +10692,22 @@
+@@ -10517,22 +10702,22 @@
  	    ;;
  	esac
  	;;
@@ -2184,7 +2063,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10537,7 +10722,7 @@
+@@ -10547,7 +10732,7 @@
  	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
@@ -2193,7 +2072,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.
-@@ -10548,18 +10733,24 @@
+@@ -10558,18 +10743,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -2222,7 +2101,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10576,25 +10767,25 @@
+@@ -10586,25 +10777,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2253,7 +2132,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
-@@ -10610,7 +10801,7 @@
+@@ -10620,7 +10811,7 @@
  	;;
        sco*)
  	case $cc_basename in
@@ -2262,7 +2141,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
  	    ;;
  	  *)
-@@ -10619,13 +10810,13 @@
+@@ -10629,13 +10820,13 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -2278,7 +2157,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10635,12 +10826,12 @@
+@@ -10645,12 +10836,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2293,7 +2172,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10650,7 +10841,7 @@
+@@ -10660,7 +10851,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2302,7 +2181,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10721,7 +10912,7 @@
+@@ -10731,7 +10922,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2311,7 +2190,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10747,6 +10938,16 @@
+@@ -10757,6 +10948,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2328,7 +2207,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10758,7 +10959,7 @@
+@@ -10768,7 +10969,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.
@@ -2337,7 +2216,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10782,12 +10983,19 @@
+@@ -10792,12 +10993,19 @@
        ;;
  
      linux*)
@@ -2358,7 +2237,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10808,9 +11016,14 @@
+@@ -10818,9 +11026,14 @@
        ;;
  
      solaris*)
@@ -2374,7 +2253,7 @@
        ;;
  
      sunos4*)
-@@ -10832,6 +11045,11 @@
+@@ -10842,6 +11055,11 @@
        fi
        ;;
  
@@ -2386,7 +2265,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10859,7 +11077,7 @@
+@@ -10869,7 +11087,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2395,7 +2274,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10892,7 +11110,10 @@
+@@ -10902,7 +11120,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -2407,7 +2286,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10918,7 +11139,7 @@
+@@ -10928,7 +11149,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -2416,7 +2295,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*
-@@ -10935,7 +11156,8 @@
+@@ -10945,7 +11166,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -2426,7 +2305,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10955,6 +11177,27 @@
+@@ -10965,6 +11187,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -2454,7 +2333,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -10992,7 +11235,7 @@
+@@ -11002,7 +11245,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
@@ -2463,7 +2342,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11002,13 +11245,13 @@
+@@ -11012,13 +11255,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'
@@ -2480,7 +2359,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
-@@ -11017,19 +11260,51 @@
+@@ -11027,19 +11270,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -2489,10 +2368,9 @@
        else
 -	ld_shlibs=no
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
--    netbsd*)
++      fi
++      ;;
++
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -2522,9 +2400,10 @@
 +	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
 +      else
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -2537,7 +2416,7 @@
        fi
        ;;
  
-@@ -11047,8 +11322,8 @@
+@@ -11057,8 +11332,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2548,7 +2427,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11063,24 +11338,19 @@
+@@ -11073,24 +11348,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2580,7 +2459,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11114,9 +11384,20 @@
+@@ -11124,9 +11394,20 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -2603,7 +2482,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11133,7 +11414,7 @@
+@@ -11143,7 +11424,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -2612,7 +2491,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`
-@@ -11154,6 +11435,9 @@
+@@ -11164,6 +11445,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -2622,7 +2501,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11162,29 +11446,29 @@
+@@ -11172,29 +11456,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -2661,7 +2540,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11198,8 +11482,8 @@
+@@ -11208,8 +11492,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -2672,7 +2551,7 @@
  	fi
        fi
        ;;
-@@ -11212,7 +11496,7 @@
+@@ -11222,7 +11506,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -2681,7 +2560,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11222,69 +11506,69 @@
+@@ -11232,69 +11516,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2797,7 +2676,7 @@
        ;;
  
      dgux*)
-@@ -11317,8 +11601,8 @@
+@@ -11327,8 +11611,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -2808,7 +2687,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
-@@ -11326,7 +11610,7 @@
+@@ -11336,7 +11620,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -2817,7 +2696,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
-@@ -11342,16 +11626,16 @@
+@@ -11352,16 +11636,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -2838,7 +2717,7 @@
  	hppa*64*|ia64*)
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -11361,7 +11645,7 @@
+@@ -11371,7 +11655,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -2847,7 +2726,7 @@
  	hppa*64*)
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -11394,7 +11678,7 @@
+@@ -11404,7 +11688,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -2856,7 +2735,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'
-@@ -11404,7 +11688,7 @@
+@@ -11414,7 +11698,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -2865,7 +2744,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
-@@ -11427,7 +11711,8 @@
+@@ -11437,7 +11721,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
@@ -2875,7 +2754,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11437,7 +11722,7 @@
+@@ -11447,7 +11732,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -2884,7 +2763,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11448,14 +11733,14 @@
+@@ -11458,14 +11743,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
@@ -2901,7 +2780,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'
-@@ -11467,13 +11752,13 @@
+@@ -11477,13 +11762,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}\*'
@@ -2917,7 +2796,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11492,10 +11777,12 @@
+@@ -11502,10 +11787,12 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -2932,7 +2811,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'
-@@ -11504,8 +11791,18 @@
+@@ -11514,8 +11801,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2953,7 +2832,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11514,7 +11811,7 @@
+@@ -11524,7 +11821,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.
@@ -2962,7 +2841,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11574,9 +11871,9 @@
+@@ -11584,9 +11881,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -2974,7 +2853,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11634,7 +11931,7 @@
+@@ -11644,7 +11941,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2983,7 +2862,7 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11768,7 +12065,7 @@
+@@ -11778,7 +12075,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
@@ -3269,18 +3148,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- config.h.in
-+++ config.h.in
-@@ -403,9 +403,6 @@
- #endif
- 
- 
--/* define to 1 if -fvisibility is supported */
--#undef __KDE_HAVE_GCC_VISIBILITY
--
- 
- #if defined(__SVR4) && !defined(__svr4__)
- #define __svr4__ 1
 --- configure
 +++ configure
 @@ -278,15 +278,15 @@
@@ -3320,7 +3187,7 @@
    --disable-fast-perl     disable fast Makefile generation (needs perl)
    --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
    --disable-debug         disables debug output and debug symbols default=no
-@@ -1186,7 +1188,7 @@
+@@ -1188,7 +1190,7 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -3329,19 +3196,10 @@
    done
  fi
  
-@@ -1958,7 +1960,7 @@
+@@ -2091,6 +2093,31 @@
  
  
- # Define the identity of the package.
-- PACKAGE=kdeutils
-+ PACKAGE=kdeutils-rc1
-  VERSION="3.5"
  
- 
-@@ -2089,6 +2091,31 @@
- 
- 
- 
 +echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
 +    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -3370,7 +3228,7 @@
  
    unset CDPATH
  
-@@ -3022,8 +3049,7 @@
+@@ -3024,8 +3051,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3380,7 +3238,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3081,8 +3107,7 @@
+@@ -3083,8 +3109,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3390,7 +3248,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3198,8 +3223,7 @@
+@@ -3200,8 +3225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3400,7 +3258,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3253,8 +3277,7 @@
+@@ -3255,8 +3279,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3410,7 +3268,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3299,8 +3322,7 @@
+@@ -3301,8 +3324,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3420,7 +3278,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3344,8 +3366,7 @@
+@@ -3346,8 +3368,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3430,7 +3288,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3902,8 +3923,7 @@
+@@ -3904,8 +3925,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3440,7 +3298,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3961,8 +3981,7 @@
+@@ -3963,8 +3983,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3450,7 +3308,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4033,8 +4052,7 @@
+@@ -4035,8 +4054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3460,7 +3318,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4078,8 +4096,7 @@
+@@ -4080,8 +4098,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3470,7 +3328,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4257,8 +4274,7 @@
+@@ -4259,8 +4276,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3480,7 +3338,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4369,8 +4385,7 @@
+@@ -4371,8 +4387,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3490,7 +3348,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4458,8 +4473,7 @@
+@@ -4460,8 +4475,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3500,7 +3358,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4561,8 +4575,7 @@
+@@ -4563,8 +4577,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3510,7 +3368,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4661,8 +4674,7 @@
+@@ -4663,8 +4676,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3520,7 +3378,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4746,8 +4758,7 @@
+@@ -4748,8 +4760,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3530,7 +3388,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4836,8 +4847,7 @@
+@@ -4838,8 +4849,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3540,7 +3398,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4924,8 +4934,7 @@
+@@ -4926,8 +4936,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3550,7 +3408,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5012,8 +5021,7 @@
+@@ -5014,8 +5023,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3560,7 +3418,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5119,8 +5127,7 @@
+@@ -5121,8 +5129,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3570,7 +3428,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5207,8 +5214,7 @@
+@@ -5209,8 +5216,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3580,7 +3438,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5295,8 +5301,7 @@
+@@ -5297,8 +5303,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3590,7 +3448,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5383,8 +5388,7 @@
+@@ -5385,8 +5390,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3600,7 +3458,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5515,8 +5519,7 @@
+@@ -5517,8 +5521,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3610,7 +3468,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5604,8 +5607,7 @@
+@@ -5606,8 +5609,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3620,7 +3478,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5692,8 +5694,7 @@
+@@ -5694,8 +5696,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3630,7 +3488,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5780,8 +5781,7 @@
+@@ -5782,8 +5783,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3640,7 +3498,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5868,8 +5868,7 @@
+@@ -5870,8 +5870,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3650,7 +3508,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5956,8 +5955,7 @@
+@@ -5958,8 +5957,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3660,7 +3518,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6380,8 +6378,7 @@
+@@ -6382,8 +6380,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3670,7 +3528,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6507,8 +6504,7 @@
+@@ -6509,8 +6506,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3680,7 +3538,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6596,8 +6592,7 @@
+@@ -6598,8 +6594,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3690,7 +3548,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6680,185 +6675,6 @@
+@@ -6682,185 +6677,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -3876,7 +3734,7 @@
    fi
  
  
-@@ -7022,7 +6838,7 @@
+@@ -7024,7 +6840,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
@@ -3885,7 +3743,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7127,7 +6943,7 @@
+@@ -7129,7 +6945,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,
@@ -3894,7 +3752,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'*)
-@@ -7161,7 +6977,7 @@
+@@ -7163,7 +6979,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -3903,7 +3761,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7191,6 +7007,15 @@
+@@ -7193,6 +7009,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3919,7 +3777,7 @@
  
  echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
  echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7277,44 +7102,36 @@
+@@ -7279,44 +7104,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -3974,7 +3832,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7330,7 +7147,7 @@
+@@ -7332,7 +7149,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -3983,7 +3841,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
-@@ -7347,42 +7164,21 @@
+@@ -7349,42 +7166,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -4033,7 +3891,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
-@@ -7401,19 +7197,14 @@
+@@ -7403,19 +7199,14 @@
    ;;
  
  openbsd*)
@@ -4055,7 +3913,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7423,7 +7214,6 @@
+@@ -7425,7 +7216,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -4063,16 +3921,16 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7500,7 +7290,7 @@
+@@ -7502,7 +7292,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7503 "configure"' > conftest.$ac_ext
-+  echo '#line 7293 "configure"' > conftest.$ac_ext
+-  echo '#line 7505 "configure"' > conftest.$ac_ext
++  echo '#line 7295 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7543,14 +7333,13 @@
+@@ -7545,14 +7335,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -4089,7 +3947,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7562,7 +7351,6 @@
+@@ -7564,7 +7353,6 @@
        esac
        ;;
      *64-bit*)
@@ -4097,7 +3955,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7622,8 +7410,7 @@
+@@ -7624,8 +7412,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4107,7 +3965,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7698,8 +7485,7 @@
+@@ -7700,8 +7487,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4117,7 +3975,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7869,8 +7655,7 @@
+@@ -7871,8 +7657,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4127,7 +3985,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7937,8 +7722,7 @@
+@@ -7939,8 +7724,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4137,7 +3995,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8053,6 +7837,243 @@
+@@ -8055,6 +7839,243 @@
  
  done
  
@@ -4381,16 +4239,16 @@
  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'
-@@ -8145,7 +8166,7 @@
+@@ -8147,7 +8168,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:8148:" \
-+echo "$as_me:8169:" \
+-echo "$as_me:8150:" \
++echo "$as_me:8171:" \
       "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
-@@ -8191,8 +8212,7 @@
+@@ -8193,8 +8214,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4400,7 +4258,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8241,8 +8261,7 @@
+@@ -8243,8 +8263,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4410,7 +4268,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8300,7 +8319,7 @@
+@@ -8302,7 +8321,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -4419,7 +4277,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8329,20 +8348,53 @@
+@@ -8331,20 +8350,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -4479,7 +4337,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.
-@@ -8379,9 +8431,6 @@
+@@ -8381,9 +8433,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -4489,7 +4347,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'"
  
-@@ -8403,6 +8452,13 @@
+@@ -8405,6 +8454,13 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -4503,7 +4361,7 @@
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
    ;;
-@@ -8410,7 +8466,7 @@
+@@ -8412,7 +8468,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -4512,7 +4370,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8428,14 +8484,17 @@
+@@ -8430,14 +8486,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -4532,7 +4390,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8597,7 +8656,7 @@
+@@ -8599,7 +8658,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -4541,7 +4399,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8617,7 +8676,7 @@
+@@ -8619,7 +8678,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -4550,7 +4408,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8902,6 +8961,17 @@
+@@ -8904,6 +8963,17 @@
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -4568,7 +4426,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -8927,7 +8997,7 @@
+@@ -8929,7 +8999,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4577,7 +4435,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
-@@ -8989,7 +9059,7 @@
+@@ -8991,7 +9061,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4586,7 +4444,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
-@@ -9088,6 +9158,20 @@
+@@ -9090,6 +9160,20 @@
  compiler=$CC
  
  
@@ -4607,7 +4465,7 @@
  #
  # Check for any special shared library compilation flags.
  #
-@@ -9124,11 +9208,16 @@
+@@ -9126,11 +9210,16 @@
     LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -4625,7 +4483,7 @@
       else
         lt_prog_compiler_static_works=yes
       fi
-@@ -9174,18 +9263,20 @@
+@@ -9176,18 +9265,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -4633,13 +4491,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:9180: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9269: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9182: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9271: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9184: \$? = $ac_status" >&5
-+   echo "$as_me:9273: \$? = $ac_status" >&5
+-   echo "$as_me:9186: \$? = $ac_status" >&5
++   echo "$as_me:9275: \$? = $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
@@ -4651,7 +4509,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -9262,7 +9353,7 @@
+@@ -9264,7 +9355,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -4660,7 +4518,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9288,6 +9379,16 @@
+@@ -9290,6 +9381,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -4677,7 +4535,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9299,7 +9400,7 @@
+@@ -9301,7 +9402,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.
@@ -4686,7 +4544,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9323,12 +9424,19 @@
+@@ -9325,12 +9426,19 @@
        ;;
  
      linux*)
@@ -4707,7 +4565,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9349,9 +9457,14 @@
+@@ -9351,9 +9459,14 @@
        ;;
  
      solaris*)
@@ -4723,7 +4581,7 @@
        ;;
  
      sunos4*)
-@@ -9373,6 +9486,11 @@
+@@ -9375,6 +9488,11 @@
        fi
        ;;
  
@@ -4735,7 +4593,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9407,18 +9525,20 @@
+@@ -9409,18 +9527,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -4743,13 +4601,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:9413: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9531: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9415: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9533: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9417: \$? = $ac_status" >&5
-+   echo "$as_me:9535: \$? = $ac_status" >&5
+-   echo "$as_me:9419: \$? = $ac_status" >&5
++   echo "$as_me:9537: \$? = $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
@@ -4761,7 +4619,7 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-@@ -9439,7 +9559,7 @@
+@@ -9441,7 +9561,7 @@
  fi
  
  fi
@@ -4770,7 +4628,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9461,38 +9581,36 @@
+@@ -9463,38 +9583,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -4791,13 +4649,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:9480: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9593: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9482: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9595: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9484: \$? = $ac_status" >&5
-+   echo "$as_me:9597: \$? = $ac_status" >&5
+-   echo "$as_me:9486: \$? = $ac_status" >&5
++   echo "$as_me:9599: \$? = $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
@@ -4821,7 +4679,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9563,6 +9681,16 @@
+@@ -9565,6 +9683,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -4838,7 +4696,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9583,6 +9711,27 @@
+@@ -9585,6 +9713,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -4866,7 +4724,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9620,7 +9769,7 @@
+@@ -9622,7 +9771,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -4875,7 +4733,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9630,13 +9779,13 @@
+@@ -9632,13 +9781,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'
@@ -4892,17 +4750,18 @@
  	# 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
-@@ -9645,19 +9794,51 @@
+@@ -9647,19 +9796,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -4930,12 +4789,11 @@
 +	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs=no
-       else
- 	ld_shlibs=no
-       fi
-       ;;
- 
--    netbsd*)
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4948,7 +4806,7 @@
        fi
        ;;
  
-@@ -9675,8 +9856,8 @@
+@@ -9677,8 +9858,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4959,7 +4817,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9691,24 +9872,19 @@
+@@ -9693,24 +9874,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4991,7 +4849,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9742,9 +9918,20 @@
+@@ -9744,9 +9920,20 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -5014,7 +4872,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9761,7 +9948,7 @@
+@@ -9763,7 +9950,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -5023,7 +4881,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`
-@@ -9782,6 +9969,9 @@
+@@ -9784,6 +9971,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -5033,7 +4891,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9790,21 +9980,22 @@
+@@ -9792,21 +9982,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -5061,7 +4919,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9828,8 +10019,7 @@
+@@ -9830,8 +10021,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5071,7 +4929,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9856,14 +10046,13 @@
+@@ -9858,14 +10048,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -5089,7 +4947,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9890,8 +10079,7 @@
+@@ -9892,8 +10081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5099,7 +4957,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9928,8 +10116,8 @@
+@@ -9930,8 +10118,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
@@ -5110,7 +4968,7 @@
  	fi
        fi
        ;;
-@@ -9942,7 +10130,7 @@
+@@ -9944,7 +10132,7 @@
        ld_shlibs=no
        ;;
  
@@ -5119,7 +4977,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -9952,13 +10140,13 @@
+@@ -9954,13 +10142,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -5136,7 +4994,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.
-@@ -9968,52 +10156,52 @@
+@@ -9970,52 +10158,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -5229,7 +5087,7 @@
      fi
        ;;
  
-@@ -10047,8 +10235,8 @@
+@@ -10049,8 +10237,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5240,7 +5098,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10056,7 +10244,7 @@
+@@ -10058,7 +10246,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -5249,7 +5107,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
-@@ -10072,16 +10260,16 @@
+@@ -10074,16 +10262,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5270,7 +5128,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -10091,7 +10279,7 @@
+@@ -10093,7 +10281,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -5279,7 +5137,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10124,7 +10312,7 @@
+@@ -10126,7 +10314,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -5288,7 +5146,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'
-@@ -10134,7 +10322,7 @@
+@@ -10136,7 +10324,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -5297,7 +5155,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10157,7 +10345,8 @@
+@@ -10159,7 +10347,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
@@ -5307,7 +5165,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10167,7 +10356,7 @@
+@@ -10169,7 +10358,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -5316,7 +5174,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10178,14 +10367,14 @@
+@@ -10180,14 +10369,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -5333,7 +5191,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'
-@@ -10197,13 +10386,13 @@
+@@ -10199,13 +10388,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5349,7 +5207,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10222,10 +10411,12 @@
+@@ -10224,10 +10413,12 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
@@ -5364,7 +5222,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'
-@@ -10234,8 +10425,18 @@
+@@ -10236,8 +10427,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5385,7 +5243,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10244,7 +10445,7 @@
+@@ -10246,7 +10447,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.
@@ -5394,7 +5252,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10304,9 +10505,9 @@
+@@ -10306,9 +10507,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -5406,7 +5264,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10412,7 +10613,7 @@
+@@ -10414,7 +10615,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5415,7 +5273,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10422,7 +10623,20 @@
+@@ -10424,7 +10625,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5437,7 +5295,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10487,7 +10701,7 @@
+@@ -10489,7 +10703,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5446,7 +5304,7 @@
    ;;
  
  beos*)
-@@ -10496,7 +10710,7 @@
+@@ -10498,7 +10712,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -5455,7 +5313,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10512,7 +10726,7 @@
+@@ -10514,7 +10728,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -5464,7 +5322,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10524,7 +10738,8 @@
+@@ -10526,7 +10740,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -5474,7 +5332,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10554,7 +10769,7 @@
+@@ -10556,7 +10771,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5483,7 +5341,7 @@
        ;;
      esac
      ;;
-@@ -10577,7 +10792,7 @@
+@@ -10579,7 +10794,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -5492,7 +5350,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"`
-@@ -10600,7 +10815,7 @@
+@@ -10602,7 +10817,7 @@
    dynamic_linker=no
    ;;
  
@@ -5501,7 +5359,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10612,8 +10827,17 @@
+@@ -10614,8 +10829,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -5521,7 +5379,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10631,7 +10855,7 @@
+@@ -10633,7 +10857,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -5530,7 +5388,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -10658,9 +10882,9 @@
+@@ -10660,9 +10884,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -5542,7 +5400,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10675,7 +10899,7 @@
+@@ -10677,7 +10901,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5551,7 +5409,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10686,7 +10910,7 @@
+@@ -10688,7 +10912,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5560,7 +5418,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10748,22 +10972,19 @@
+@@ -10750,22 +10974,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5589,7 +5447,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,
-@@ -10773,6 +10994,30 @@
+@@ -10775,6 +10996,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5620,7 +5478,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10782,7 +11027,7 @@
+@@ -10784,7 +11029,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5629,7 +5487,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10811,7 +11056,11 @@
+@@ -10813,7 +11058,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -5642,7 +5500,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
-@@ -10831,7 +11080,7 @@
+@@ -10833,7 +11082,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5651,7 +5509,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -10933,8 +11182,8 @@
+@@ -10935,8 +11184,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
@@ -5662,7 +5520,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11060,8 +11309,7 @@
+@@ -11062,8 +11311,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5672,7 +5530,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11164,8 +11412,7 @@
+@@ -11166,8 +11414,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5682,7 +5540,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11230,8 +11477,7 @@
+@@ -11232,8 +11479,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5692,7 +5550,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11324,8 +11570,7 @@
+@@ -11326,8 +11572,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5702,7 +5560,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11390,8 +11635,7 @@
+@@ -11392,8 +11637,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5712,7 +5570,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11457,8 +11701,7 @@
+@@ -11459,8 +11703,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5722,7 +5580,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11524,8 +11767,7 @@
+@@ -11526,8 +11769,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5732,16 +5590,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11600,7 +11842,7 @@
+@@ -11602,7 +11844,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11603 "configure"
-+#line 11845 "configure"
+-#line 11605 "configure"
++#line 11847 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11666,7 +11908,7 @@
+@@ -11668,7 +11910,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5750,16 +5608,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11698,7 +11940,7 @@
+@@ -11700,7 +11942,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11701 "configure"
-+#line 11943 "configure"
+-#line 11703 "configure"
++#line 11945 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11764,7 +12006,7 @@
+@@ -11766,7 +12008,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5768,7 +5626,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11814,7 +12056,7 @@
+@@ -11816,7 +12058,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -5777,7 +5635,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -11823,47 +12065,10 @@
+@@ -11825,47 +12067,10 @@
    fi
    ;;
  
@@ -5826,7 +5684,7 @@
      ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11889,7 +12094,8 @@
+@@ -11891,7 +12096,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.
@@ -5836,7 +5694,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 \
-@@ -12003,11 +12209,11 @@
+@@ -12005,11 +12211,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5850,7 +5708,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12037,6 +12243,12 @@
+@@ -12039,6 +12245,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -5863,7 +5721,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12067,7 +12279,7 @@
+@@ -12069,7 +12281,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -5872,7 +5730,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12098,7 +12310,7 @@
+@@ -12100,7 +12312,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -5881,7 +5739,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12113,7 +12325,7 @@
+@@ -12115,7 +12327,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -5890,7 +5748,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12340,7 +12552,10 @@
+@@ -12342,7 +12554,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.
@@ -5902,7 +5760,7 @@
  fi
  
  
-@@ -12405,7 +12620,9 @@
+@@ -12407,7 +12622,9 @@
  
        case $tagname in
        CXX)
@@ -5913,7 +5771,7 @@
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12442,7 +12659,7 @@
+@@ -12444,7 +12661,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -5922,7 +5780,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12463,6 +12680,20 @@
+@@ -12465,6 +12682,20 @@
  compiler=$CC
  
  
@@ -5943,7 +5801,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12484,7 +12715,16 @@
+@@ -12486,7 +12717,16 @@
  CC=${CXX-"c++"}
  compiler=$CC
  compiler_CXX=$CC
@@ -5961,7 +5819,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12555,7 +12795,7 @@
+@@ -12557,7 +12797,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,
@@ -5970,7 +5828,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'*)
-@@ -12589,7 +12829,7 @@
+@@ -12591,7 +12831,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -5979,7 +5837,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12608,8 +12848,8 @@
+@@ -12610,8 +12850,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
@@ -5990,7 +5848,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12635,7 +12875,7 @@
+@@ -12637,7 +12877,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.
@@ -5999,7 +5857,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12666,8 +12906,22 @@
+@@ -12668,8 +12908,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -6024,7 +5882,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12684,7 +12938,7 @@
+@@ -12686,7 +12940,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -6033,7 +5891,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`
-@@ -12705,6 +12959,9 @@
+@@ -12707,6 +12961,9 @@
  	fi
        esac
        shared_flag='-shared'
@@ -6043,7 +5901,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12713,15 +12970,16 @@
+@@ -12715,15 +12972,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -6064,7 +5922,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.
-@@ -12751,8 +13009,7 @@
+@@ -12753,8 +13011,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6074,7 +5932,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12781,13 +13038,12 @@
+@@ -12783,13 +13040,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -6090,7 +5948,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12814,8 +13070,7 @@
+@@ -12816,8 +13072,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6100,7 +5958,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12852,8 +13107,8 @@
+@@ -12854,8 +13109,8 @@
  	# Exported symbols can be pulled into shared objects from archives
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
@@ -6111,7 +5969,7 @@
        fi
      fi
      ;;
-@@ -12866,16 +13121,17 @@
+@@ -12868,16 +13123,17 @@
      esac
      ;;
  
@@ -6131,7 +5989,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
-@@ -12884,70 +13140,81 @@
+@@ -12886,70 +13142,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -6265,7 +6123,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -12958,14 +13225,14 @@
+@@ -12960,14 +13227,14 @@
  	;;
      esac
      ;;
@@ -6282,7 +6140,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12982,12 +13249,12 @@
+@@ -12984,12 +13251,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -6298,7 +6156,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -12996,11 +13263,11 @@
+@@ -12998,11 +13265,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.
@@ -6312,7 +6170,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13010,7 +13277,7 @@
+@@ -13012,7 +13279,7 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -6321,7 +6179,7 @@
        hppa*64*)
  	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
  	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13026,7 +13293,7 @@
+@@ -13028,7 +13295,7 @@
          ;;
        esac
      fi
@@ -6330,7 +6188,7 @@
      hppa*64*)
        hardcode_direct_CXX=no
        hardcode_shlibpath_var_CXX=no
-@@ -13047,17 +13314,17 @@
+@@ -13049,17 +13316,17 @@
      esac
  
      case $cc_basename in
@@ -6352,7 +6210,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13073,12 +13340,12 @@
+@@ -13075,12 +13342,12 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -6367,7 +6225,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13091,9 +13358,9 @@
+@@ -13093,9 +13360,9 @@
      ;;
    irix5* | irix6*)
      case $cc_basename in
@@ -6379,7 +6237,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13104,9 +13371,9 @@
+@@ -13106,9 +13373,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -6391,7 +6249,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13117,14 +13384,14 @@
+@@ -13119,14 +13386,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -6409,7 +6267,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13142,20 +13409,44 @@
+@@ -13144,20 +13411,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -6460,7 +6318,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13183,7 +13474,7 @@
+@@ -13185,7 +13476,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -6469,7 +6327,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13193,7 +13484,7 @@
+@@ -13195,7 +13486,7 @@
  	;;
      esac
      ;;
@@ -6478,7 +6336,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=
-@@ -13204,15 +13495,31 @@
+@@ -13206,15 +13497,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::"'
      ;;
@@ -6512,7 +6370,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13222,14 +13529,14 @@
+@@ -13224,14 +13531,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -6530,7 +6388,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13247,7 +13554,7 @@
+@@ -13249,7 +13556,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6539,7 +6397,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13266,13 +13573,13 @@
+@@ -13268,13 +13575,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -6555,7 +6413,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13281,17 +13588,17 @@
+@@ -13283,17 +13590,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -6577,7 +6435,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13310,7 +13617,7 @@
+@@ -13312,7 +13619,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6586,7 +6444,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13334,7 +13641,7 @@
+@@ -13336,7 +13643,7 @@
    sco*)
      archive_cmds_need_lc_CXX=no
      case $cc_basename in
@@ -6595,7 +6453,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13346,12 +13653,12 @@
+@@ -13348,12 +13655,12 @@
      ;;
    sunos4*)
      case $cc_basename in
@@ -6610,7 +6468,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13364,36 +13671,33 @@
+@@ -13366,36 +13673,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -6659,7 +6517,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13401,9 +13705,9 @@
+@@ -13403,9 +13707,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -6671,7 +6529,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13413,9 +13717,9 @@
+@@ -13415,9 +13719,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
@@ -6683,7 +6541,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13424,9 +13728,9 @@
+@@ -13426,9 +13730,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -6695,7 +6553,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13444,7 +13748,7 @@
+@@ -13446,7 +13750,7 @@
      ;;
    tandem*)
      case $cc_basename in
@@ -6704,7 +6562,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13501,7 +13805,7 @@
+@@ -13503,7 +13807,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.
@@ -6713,7 +6571,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13541,7 +13845,7 @@
+@@ -13543,7 +13847,7 @@
         fi
         ;;
  
@@ -6722,7 +6580,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13577,6 +13881,20 @@
+@@ -13579,6 +13883,20 @@
  
  $rm -f confest.$objext
  
@@ -6743,7 +6601,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13632,7 +13950,7 @@
+@@ -13634,7 +13952,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -6752,7 +6610,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13657,18 +13975,28 @@
+@@ -13659,18 +13977,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -6784,7 +6642,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13676,22 +14004,22 @@
+@@ -13678,22 +14006,22 @@
  	    ;;
  	esac
  	;;
@@ -6811,7 +6669,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13706,7 +14034,7 @@
+@@ -13708,7 +14036,7 @@
  	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
@@ -6820,7 +6678,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13717,18 +14045,24 @@
+@@ -13719,18 +14047,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -6848,7 +6706,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13745,25 +14079,25 @@
+@@ -13747,25 +14081,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -6879,7 +6737,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13779,7 +14113,7 @@
+@@ -13781,7 +14115,7 @@
  	;;
        sco*)
  	case $cc_basename in
@@ -6888,7 +6746,7 @@
  	    lt_prog_compiler_pic_CXX='-fPIC'
  	    ;;
  	  *)
-@@ -13788,13 +14122,13 @@
+@@ -13790,13 +14124,13 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -6904,7 +6762,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13804,12 +14138,12 @@
+@@ -13806,12 +14140,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -6919,7 +6777,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13819,7 +14153,7 @@
+@@ -13821,7 +14155,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -6928,7 +6786,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -13860,18 +14194,20 @@
+@@ -13862,18 +14196,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -6936,13 +6794,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:13866: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14200: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13868: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14202: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13870: \$? = $ac_status" >&5
-+   echo "$as_me:14204: \$? = $ac_status" >&5
+-   echo "$as_me:13872: \$? = $ac_status" >&5
++   echo "$as_me:14206: \$? = $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
@@ -6954,7 +6812,7 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-@@ -13892,7 +14228,7 @@
+@@ -13894,7 +14230,7 @@
  fi
  
  fi
@@ -6963,7 +6821,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -13914,38 +14250,36 @@
+@@ -13916,38 +14252,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -6984,13 +6842,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:13933: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14262: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13935: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14264: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13937: \$? = $ac_status" >&5
-+   echo "$as_me:14266: \$? = $ac_status" >&5
+-   echo "$as_me:13939: \$? = $ac_status" >&5
++   echo "$as_me:14268: \$? = $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
@@ -7014,7 +6872,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -13995,7 +14329,10 @@
+@@ -13997,7 +14331,10 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -7026,7 +6884,7 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14078,7 +14415,7 @@
+@@ -14080,7 +14417,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -7035,7 +6893,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14088,7 +14425,20 @@
+@@ -14090,7 +14427,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7057,7 +6915,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14153,7 +14503,7 @@
+@@ -14155,7 +14505,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7066,7 +6924,7 @@
    ;;
  
  beos*)
-@@ -14162,7 +14512,7 @@
+@@ -14164,7 +14514,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -7075,7 +6933,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14178,7 +14528,7 @@
+@@ -14180,7 +14530,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -7084,7 +6942,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14190,7 +14540,8 @@
+@@ -14192,7 +14542,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -7094,7 +6952,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14220,7 +14571,7 @@
+@@ -14222,7 +14573,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7103,7 +6961,7 @@
        ;;
      esac
      ;;
-@@ -14243,7 +14594,7 @@
+@@ -14245,7 +14596,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -7112,7 +6970,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"`
-@@ -14266,7 +14617,7 @@
+@@ -14268,7 +14619,7 @@
    dynamic_linker=no
    ;;
  
@@ -7121,7 +6979,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14278,8 +14629,17 @@
+@@ -14280,8 +14631,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -7141,7 +6999,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14297,7 +14657,7 @@
+@@ -14299,7 +14659,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -7150,7 +7008,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -14324,9 +14684,9 @@
+@@ -14326,9 +14686,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -7162,7 +7020,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14341,7 +14701,7 @@
+@@ -14343,7 +14703,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -7171,7 +7029,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14352,7 +14712,7 @@
+@@ -14354,7 +14714,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -7180,7 +7038,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14414,22 +14774,19 @@
+@@ -14416,22 +14776,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7209,7 +7067,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,
-@@ -14439,6 +14796,30 @@
+@@ -14441,6 +14798,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -7240,7 +7098,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14448,7 +14829,7 @@
+@@ -14450,7 +14831,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -7249,7 +7107,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14477,7 +14858,11 @@
+@@ -14479,7 +14860,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -7262,7 +7120,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
-@@ -14497,7 +14882,7 @@
+@@ -14499,7 +14884,7 @@
  
  os2*)
    libname_spec='$name'
@@ -7271,7 +7129,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14599,8 +14984,8 @@
+@@ -14601,8 +14986,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -7282,7 +7140,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14726,8 +15111,7 @@
+@@ -14728,8 +15113,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7292,7 +7150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14830,8 +15214,7 @@
+@@ -14832,8 +15216,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7302,7 +7160,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14896,8 +15279,7 @@
+@@ -14898,8 +15281,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7312,7 +7170,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14990,8 +15372,7 @@
+@@ -14992,8 +15374,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7322,7 +7180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15056,8 +15437,7 @@
+@@ -15058,8 +15439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7332,7 +7190,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15123,8 +15503,7 @@
+@@ -15125,8 +15505,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7342,7 +7200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15190,8 +15569,7 @@
+@@ -15192,8 +15571,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7352,16 +7210,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15266,7 +15644,7 @@
+@@ -15268,7 +15646,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15269 "configure"
-+#line 15647 "configure"
+-#line 15271 "configure"
++#line 15649 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15332,7 +15710,7 @@
+@@ -15334,7 +15712,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7370,16 +7228,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15364,7 +15742,7 @@
+@@ -15366,7 +15744,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15367 "configure"
-+#line 15745 "configure"
+-#line 15369 "configure"
++#line 15747 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15430,7 +15808,7 @@
+@@ -15432,7 +15810,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7388,7 +7246,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15481,7 +15859,8 @@
+@@ -15483,7 +15861,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.
@@ -7398,7 +7256,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 \
-@@ -15581,6 +15960,12 @@
+@@ -15583,6 +15962,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -7411,7 +7269,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -15611,7 +15996,7 @@
+@@ -15613,7 +15998,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7420,7 +7278,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15642,7 +16027,7 @@
+@@ -15644,7 +16029,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7429,7 +7287,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15657,7 +16042,7 @@
+@@ -15659,7 +16044,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
@@ -7438,7 +7296,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -15859,7 +16244,10 @@
+@@ -15861,7 +16246,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.
@@ -7450,7 +7308,7 @@
  fi
  
  
-@@ -15935,12 +16323,35 @@
+@@ -15937,12 +16325,35 @@
  compiler=$CC
  
  
@@ -7487,7 +7345,7 @@
  
  echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
  echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15953,7 +16364,7 @@
+@@ -15955,7 +16366,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -7496,7 +7354,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -15961,8 +16372,10 @@
+@@ -15963,8 +16374,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -7509,7 +7367,7 @@
    ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16039,7 +16452,7 @@
+@@ -16041,7 +16454,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -7518,7 +7376,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16065,6 +16478,16 @@
+@@ -16067,6 +16480,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -7535,7 +7393,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16076,7 +16499,7 @@
+@@ -16078,7 +16501,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.
@@ -7544,7 +7402,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16100,12 +16523,19 @@
+@@ -16102,12 +16525,19 @@
        ;;
  
      linux*)
@@ -7565,7 +7423,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16126,9 +16556,14 @@
+@@ -16128,9 +16558,14 @@
        ;;
  
      solaris*)
@@ -7581,7 +7439,7 @@
        ;;
  
      sunos4*)
-@@ -16150,6 +16585,11 @@
+@@ -16152,6 +16587,11 @@
        fi
        ;;
  
@@ -7593,7 +7451,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16184,18 +16624,20 @@
+@@ -16186,18 +16626,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -7601,13 +7459,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:16190: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16630: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16192: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16194: \$? = $ac_status" >&5
-+   echo "$as_me:16634: \$? = $ac_status" >&5
+-   echo "$as_me:16196: \$? = $ac_status" >&5
++   echo "$as_me:16636: \$? = $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
@@ -7619,7 +7477,7 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-@@ -16216,7 +16658,7 @@
+@@ -16218,7 +16660,7 @@
  fi
  
  fi
@@ -7628,7 +7486,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16238,38 +16680,36 @@
+@@ -16240,38 +16682,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -7649,13 +7507,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:16257: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16692: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16259: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16694: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16261: \$? = $ac_status" >&5
-+   echo "$as_me:16696: \$? = $ac_status" >&5
+-   echo "$as_me:16263: \$? = $ac_status" >&5
++   echo "$as_me:16698: \$? = $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
@@ -7679,7 +7537,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16340,6 +16780,16 @@
+@@ -16342,6 +16782,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -7696,7 +7554,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16360,6 +16810,27 @@
+@@ -16362,6 +16812,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -7724,7 +7582,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16397,7 +16868,7 @@
+@@ -16399,7 +16870,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -7733,7 +7591,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16407,13 +16878,13 @@
+@@ -16409,13 +16880,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'
@@ -7750,7 +7608,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
-@@ -16422,19 +16893,51 @@
+@@ -16424,19 +16895,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -7759,10 +7617,9 @@
        else
 -	ld_shlibs=no
 +	ld_shlibs_F77=no
-       fi
-       ;;
- 
--    netbsd*)
++      fi
++      ;;
++
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -7792,9 +7649,10 @@
 +	link_all_deplibs_F77=no
 +      else
 +	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7807,7 +7665,7 @@
        fi
        ;;
  
-@@ -16452,8 +16955,8 @@
+@@ -16454,8 +16957,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7818,7 +7676,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16468,24 +16971,19 @@
+@@ -16470,24 +16973,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7850,7 +7708,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16519,9 +17017,20 @@
+@@ -16521,9 +17019,20 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -7873,7 +7731,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16538,7 +17047,7 @@
+@@ -16540,7 +17049,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -7882,7 +7740,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`
-@@ -16559,6 +17068,9 @@
+@@ -16561,6 +17070,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -7892,7 +7750,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16567,21 +17079,22 @@
+@@ -16569,21 +17081,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -7920,7 +7778,7 @@
        program main
  
        end
-@@ -16595,8 +17108,7 @@
+@@ -16597,8 +17110,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7930,7 +7788,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16623,14 +17135,13 @@
+@@ -16625,14 +17137,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -7948,7 +7806,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16647,8 +17158,7 @@
+@@ -16649,8 +17160,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7958,7 +7816,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16685,8 +17195,8 @@
+@@ -16687,8 +17197,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
@@ -7969,7 +7827,7 @@
  	fi
        fi
        ;;
-@@ -16699,7 +17209,7 @@
+@@ -16701,7 +17211,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -7978,7 +7836,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16709,68 +17219,68 @@
+@@ -16711,68 +17221,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -7994,13 +7852,14 @@
 +      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_F77='true'
--      # FIXME: Should let the user specify the lib program.
--      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+       # FIXME: Should let the user specify the lib program.
+       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
 -      fix_srcfile_path='`cygpath -w "$srcfile"`'
--      enable_shared_with_static_runtimes_F77=yes
--      ;;
--
--    darwin* | rhapsody*)
++      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       enable_shared_with_static_runtimes_F77=yes
+       ;;
+ 
+     darwin* | rhapsody*)
 -    if test "$GXX" = yes ; then
 -      archive_cmds_need_lc_F77=no
 -      case "$host_os" in
@@ -8021,13 +7880,6 @@
 -	  esac
 -	fi
 -	;;
-+      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes_F77=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
 +      case $host_os in
 +        rhapsody* | darwin1.[012])
 +         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
@@ -8097,7 +7949,7 @@
      fi
        ;;
  
-@@ -16804,8 +17314,8 @@
+@@ -16806,8 +17316,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8108,7 +7960,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16813,7 +17323,7 @@
+@@ -16815,7 +17325,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -8117,7 +7969,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
-@@ -16829,16 +17339,16 @@
+@@ -16831,16 +17341,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8138,7 +7990,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -16848,7 +17358,7 @@
+@@ -16850,7 +17360,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -8147,7 +7999,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16881,7 +17391,7 @@
+@@ -16883,7 +17393,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -8156,7 +8008,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'
-@@ -16891,7 +17401,7 @@
+@@ -16893,7 +17403,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -8165,7 +8017,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
-@@ -16914,7 +17424,8 @@
+@@ -16916,7 +17426,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
@@ -8175,7 +8027,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16924,7 +17435,7 @@
+@@ -16926,7 +17437,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -8184,7 +8036,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16935,14 +17446,14 @@
+@@ -16937,14 +17448,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -8201,7 +8053,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'
-@@ -16954,13 +17465,13 @@
+@@ -16956,13 +17467,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8217,7 +8069,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16979,10 +17490,12 @@
+@@ -16981,10 +17492,12 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
@@ -8232,7 +8084,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'
-@@ -16991,8 +17504,18 @@
+@@ -16993,8 +17506,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8253,7 +8105,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17001,7 +17524,7 @@
+@@ -17003,7 +17526,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.
@@ -8262,7 +8114,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17061,9 +17584,9 @@
+@@ -17063,9 +17586,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -8274,7 +8126,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17169,7 +17692,7 @@
+@@ -17171,7 +17694,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -8283,7 +8135,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17179,7 +17702,20 @@
+@@ -17181,7 +17704,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8305,7 +8157,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17244,7 +17780,7 @@
+@@ -17246,7 +17782,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8314,7 +8166,7 @@
    ;;
  
  beos*)
-@@ -17253,7 +17789,7 @@
+@@ -17255,7 +17791,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -8323,7 +8175,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17269,7 +17805,7 @@
+@@ -17271,7 +17807,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -8332,7 +8184,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17281,7 +17817,8 @@
+@@ -17283,7 +17819,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -8342,7 +8194,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17311,7 +17848,7 @@
+@@ -17313,7 +17850,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8351,7 +8203,7 @@
        ;;
      esac
      ;;
-@@ -17334,7 +17871,7 @@
+@@ -17336,7 +17873,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -8360,7 +8212,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"`
-@@ -17357,7 +17894,7 @@
+@@ -17359,7 +17896,7 @@
    dynamic_linker=no
    ;;
  
@@ -8369,7 +8221,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17369,8 +17906,17 @@
+@@ -17371,8 +17908,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -8389,7 +8241,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17388,7 +17934,7 @@
+@@ -17390,7 +17936,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -8398,7 +8250,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -17415,9 +17961,9 @@
+@@ -17417,9 +17963,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -8410,7 +8262,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17432,7 +17978,7 @@
+@@ -17434,7 +17980,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -8419,7 +8271,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17443,7 +17989,7 @@
+@@ -17445,7 +17991,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -8428,7 +8280,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17505,22 +18051,19 @@
+@@ -17507,22 +18053,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8457,7 +8309,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,
-@@ -17530,6 +18073,30 @@
+@@ -17532,6 +18075,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8488,7 +8340,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17539,7 +18106,7 @@
+@@ -17541,7 +18108,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -8497,7 +8349,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17568,7 +18135,11 @@
+@@ -17570,7 +18137,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -8510,7 +8362,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
-@@ -17588,7 +18159,7 @@
+@@ -17590,7 +18161,7 @@
  
  os2*)
    libname_spec='$name'
@@ -8519,7 +8371,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17690,8 +18261,8 @@
+@@ -17692,8 +18263,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8530,7 +8382,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17767,7 +18338,8 @@
+@@ -17769,7 +18340,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.
@@ -8540,7 +8392,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 \
-@@ -17867,6 +18439,12 @@
+@@ -17869,6 +18441,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -8553,7 +8405,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -17897,7 +18475,7 @@
+@@ -17899,7 +18477,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -8562,7 +8414,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17928,7 +18506,7 @@
+@@ -17930,7 +18508,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -8571,7 +8423,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -17943,7 +18521,7 @@
+@@ -17945,7 +18523,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -8580,7 +8432,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18145,7 +18723,10 @@
+@@ -18147,7 +18725,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.
@@ -8592,7 +8444,7 @@
  fi
  
  
-@@ -18178,7 +18759,7 @@
+@@ -18180,7 +18761,7 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -8601,7 +8453,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -18189,15 +18770,41 @@
+@@ -18191,15 +18772,41 @@
  compiler=$CC
  
  
@@ -8643,7 +8495,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
-@@ -18224,18 +18831,20 @@
+@@ -18226,18 +18833,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -8651,13 +8503,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:18230: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18837: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18232: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18839: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18234: \$? = $ac_status" >&5
-+   echo "$as_me:18841: \$? = $ac_status" >&5
+-   echo "$as_me:18236: \$? = $ac_status" >&5
++   echo "$as_me:18843: \$? = $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
@@ -8669,7 +8521,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -18312,7 +18921,7 @@
+@@ -18314,7 +18923,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -8678,7 +8530,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18338,6 +18947,16 @@
+@@ -18340,6 +18949,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -8695,7 +8547,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18349,7 +18968,7 @@
+@@ -18351,7 +18970,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.
@@ -8704,7 +8556,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18373,12 +18992,19 @@
+@@ -18375,12 +18994,19 @@
        ;;
  
      linux*)
@@ -8725,7 +8577,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18399,9 +19025,14 @@
+@@ -18401,9 +19027,14 @@
        ;;
  
      solaris*)
@@ -8741,7 +8593,7 @@
        ;;
  
      sunos4*)
-@@ -18423,6 +19054,11 @@
+@@ -18425,6 +19056,11 @@
        fi
        ;;
  
@@ -8753,7 +8605,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18457,18 +19093,20 @@
+@@ -18459,18 +19095,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -8761,13 +8613,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:18463: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19099: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18465: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19101: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18467: \$? = $ac_status" >&5
-+   echo "$as_me:19103: \$? = $ac_status" >&5
+-   echo "$as_me:18469: \$? = $ac_status" >&5
++   echo "$as_me:19105: \$? = $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
@@ -8779,7 +8631,7 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-@@ -18489,7 +19127,7 @@
+@@ -18491,7 +19129,7 @@
  fi
  
  fi
@@ -8788,7 +8640,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18511,38 +19149,36 @@
+@@ -18513,38 +19151,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -8809,13 +8661,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:18530: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19161: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18532: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19163: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18534: \$? = $ac_status" >&5
-+   echo "$as_me:19165: \$? = $ac_status" >&5
+-   echo "$as_me:18536: \$? = $ac_status" >&5
++   echo "$as_me:19167: \$? = $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
@@ -8839,7 +8691,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18613,6 +19249,16 @@
+@@ -18615,6 +19251,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -8856,7 +8708,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18633,6 +19279,27 @@
+@@ -18635,6 +19281,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -8884,7 +8736,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18670,7 +19337,7 @@
+@@ -18672,7 +19339,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -8893,7 +8745,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18680,13 +19347,13 @@
+@@ -18682,13 +19349,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'
@@ -8910,7 +8762,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
-@@ -18695,19 +19362,51 @@
+@@ -18697,19 +19364,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -8919,9 +8771,10 @@
        else
 -	ld_shlibs=no
 +	ld_shlibs_GCJ=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -8951,10 +8804,9 @@
 +	link_all_deplibs_GCJ=no
 +      else
 +	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
--    netbsd*)
++      fi
++      ;;
++
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -8967,7 +8819,7 @@
        fi
        ;;
  
-@@ -18725,8 +19424,8 @@
+@@ -18727,8 +19426,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8978,7 +8830,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18741,24 +19440,19 @@
+@@ -18743,24 +19442,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9010,7 +8862,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18792,9 +19486,20 @@
+@@ -18794,9 +19488,20 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -9033,7 +8885,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18811,7 +19516,7 @@
+@@ -18813,7 +19518,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -9042,7 +8894,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`
-@@ -18832,6 +19537,9 @@
+@@ -18834,6 +19539,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -9052,7 +8904,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -18840,21 +19548,22 @@
+@@ -18842,21 +19550,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -9080,7 +8932,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18878,8 +19587,7 @@
+@@ -18880,8 +19589,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9090,7 +8942,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18906,14 +19614,13 @@
+@@ -18908,14 +19616,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -9108,7 +8960,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18940,8 +19647,7 @@
+@@ -18942,8 +19649,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9118,7 +8970,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18978,8 +19684,8 @@
+@@ -18980,8 +19686,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
@@ -9129,7 +8981,7 @@
  	fi
        fi
        ;;
-@@ -18992,7 +19698,7 @@
+@@ -18994,7 +19700,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -9138,7 +8990,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19002,68 +19708,68 @@
+@@ -19004,68 +19710,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -9251,7 +9103,7 @@
      fi
        ;;
  
-@@ -19097,8 +19803,8 @@
+@@ -19099,8 +19805,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9262,7 +9114,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19106,7 +19812,7 @@
+@@ -19108,7 +19814,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -9271,7 +9123,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
-@@ -19122,16 +19828,16 @@
+@@ -19124,16 +19830,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9292,7 +9144,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -19141,7 +19847,7 @@
+@@ -19143,7 +19849,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -9301,7 +9153,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19174,7 +19880,7 @@
+@@ -19176,7 +19882,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -9310,7 +9162,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'
-@@ -19184,7 +19890,7 @@
+@@ -19186,7 +19892,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -9319,7 +9171,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
-@@ -19207,7 +19913,8 @@
+@@ -19209,7 +19915,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
@@ -9329,7 +9181,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19217,7 +19924,7 @@
+@@ -19219,7 +19926,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -9338,7 +9190,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19228,14 +19935,14 @@
+@@ -19230,14 +19937,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -9355,7 +9207,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'
-@@ -19247,13 +19954,13 @@
+@@ -19249,13 +19956,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9371,7 +9223,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19272,10 +19979,12 @@
+@@ -19274,10 +19981,12 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
@@ -9386,7 +9238,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'
-@@ -19284,8 +19993,18 @@
+@@ -19286,8 +19995,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9407,7 +9259,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19294,7 +20013,7 @@
+@@ -19296,7 +20015,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.
@@ -9416,7 +9268,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19354,9 +20073,9 @@
+@@ -19356,9 +20075,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -9428,7 +9280,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19462,7 +20181,7 @@
+@@ -19464,7 +20183,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -9437,7 +9289,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19472,7 +20191,20 @@
+@@ -19474,7 +20193,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9459,7 +9311,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19537,7 +20269,7 @@
+@@ -19539,7 +20271,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9468,7 +9320,7 @@
    ;;
  
  beos*)
-@@ -19546,7 +20278,7 @@
+@@ -19548,7 +20280,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -9477,7 +9329,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19562,7 +20294,7 @@
+@@ -19564,7 +20296,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -9486,7 +9338,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19574,7 +20306,8 @@
+@@ -19576,7 +20308,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -9496,7 +9348,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19604,7 +20337,7 @@
+@@ -19606,7 +20339,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9505,7 +9357,7 @@
        ;;
      esac
      ;;
-@@ -19627,7 +20360,7 @@
+@@ -19629,7 +20362,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -9514,7 +9366,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"`
-@@ -19650,7 +20383,7 @@
+@@ -19652,7 +20385,7 @@
    dynamic_linker=no
    ;;
  
@@ -9523,7 +9375,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19662,8 +20395,17 @@
+@@ -19664,8 +20397,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -9543,7 +9395,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19681,7 +20423,7 @@
+@@ -19683,7 +20425,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -9552,7 +9404,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -19708,9 +20450,9 @@
+@@ -19710,9 +20452,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -9564,7 +9416,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19725,7 +20467,7 @@
+@@ -19727,7 +20469,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -9573,7 +9425,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19736,7 +20478,7 @@
+@@ -19738,7 +20480,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -9582,7 +9434,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19798,22 +20540,19 @@
+@@ -19800,22 +20542,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -9611,7 +9463,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,
-@@ -19823,6 +20562,30 @@
+@@ -19825,6 +20564,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9642,7 +9494,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19832,7 +20595,7 @@
+@@ -19834,7 +20597,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -9651,7 +9503,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19861,7 +20624,11 @@
+@@ -19863,7 +20626,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -9664,7 +9516,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
-@@ -19881,7 +20648,7 @@
+@@ -19883,7 +20650,7 @@
  
  os2*)
    libname_spec='$name'
@@ -9673,7 +9525,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -19983,8 +20750,8 @@
+@@ -19985,8 +20752,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -9684,7 +9536,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_GCJ" != no &&
-@@ -20110,8 +20877,7 @@
+@@ -20112,8 +20879,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9694,7 +9546,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20214,8 +20980,7 @@
+@@ -20216,8 +20982,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9704,7 +9556,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20280,8 +21045,7 @@
+@@ -20282,8 +21047,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9714,7 +9566,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20374,8 +21138,7 @@
+@@ -20376,8 +21140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9724,7 +9576,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20440,8 +21203,7 @@
+@@ -20442,8 +21205,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9734,7 +9586,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20507,8 +21269,7 @@
+@@ -20509,8 +21271,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9744,7 +9596,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20574,8 +21335,7 @@
+@@ -20576,8 +21337,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9754,16 +9606,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20650,7 +21410,7 @@
+@@ -20652,7 +21412,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20653 "configure"
-+#line 21413 "configure"
+-#line 20655 "configure"
++#line 21415 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20716,7 +21476,7 @@
+@@ -20718,7 +21478,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9772,16 +9624,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20748,7 +21508,7 @@
+@@ -20750,7 +21510,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20751 "configure"
-+#line 21511 "configure"
+-#line 20753 "configure"
++#line 21513 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20814,7 +21574,7 @@
+@@ -20816,7 +21576,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9790,7 +9642,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20865,7 +21625,8 @@
+@@ -20867,7 +21627,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.
@@ -9800,7 +9652,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 \
-@@ -20965,6 +21726,12 @@
+@@ -20967,6 +21728,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -9813,7 +9665,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -20995,7 +21762,7 @@
+@@ -20997,7 +21764,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9822,7 +9674,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21026,7 +21793,7 @@
+@@ -21028,7 +21795,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9831,7 +9683,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21041,7 +21808,7 @@
+@@ -21043,7 +21810,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -9840,7 +9692,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21243,7 +22010,10 @@
+@@ -21245,7 +22012,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.
@@ -9852,7 +9704,7 @@
  fi
  
  
-@@ -21286,11 +22056,35 @@
+@@ -21288,11 +22058,35 @@
  compiler=$CC
  
  
@@ -9888,7 +9740,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21306,7 +22100,8 @@
+@@ -21308,7 +22102,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.
@@ -9898,7 +9750,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 \
-@@ -21406,6 +22201,12 @@
+@@ -21408,6 +22203,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -9911,7 +9763,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21436,7 +22237,7 @@
+@@ -21438,7 +22239,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9920,7 +9772,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21467,7 +22268,7 @@
+@@ -21469,7 +22270,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9929,7 +9781,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21482,7 +22283,7 @@
+@@ -21484,7 +22285,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -9938,7 +9790,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21684,7 +22485,10 @@
+@@ -21686,7 +22487,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.
@@ -9950,7 +9802,7 @@
  fi
  
  
-@@ -21731,7 +22535,7 @@
+@@ -21733,7 +22537,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -9959,7 +9811,7 @@
  
  # Prevent multiple expansion
  
-@@ -21972,8 +22776,7 @@
+@@ -21974,8 +22778,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9969,7 +9821,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22047,9 +22850,6 @@
+@@ -22049,9 +22852,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9979,7 +9831,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22083,8 +22883,7 @@
+@@ -22085,8 +22885,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9989,7 +9841,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22188,8 +22987,7 @@
+@@ -22190,8 +22989,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9999,7 +9851,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22268,9 +23066,6 @@
+@@ -22270,9 +23068,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10009,7 +9861,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22303,8 +23098,7 @@
+@@ -22305,8 +23100,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10019,7 +9871,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22407,8 +23201,7 @@
+@@ -22409,8 +23203,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10029,7 +9881,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22498,8 +23291,7 @@
+@@ -22500,8 +23293,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10039,7 +9891,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22560,8 +23352,7 @@
+@@ -22562,8 +23354,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10049,7 +9901,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22629,8 +23420,7 @@
+@@ -22631,8 +23422,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10059,7 +9911,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22696,8 +23486,7 @@
+@@ -22698,8 +23488,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10069,7 +9921,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22790,8 +23579,7 @@
+@@ -22792,8 +23581,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10079,7 +9931,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22869,8 +23657,7 @@
+@@ -22871,8 +23659,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10089,7 +9941,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22954,8 +23741,7 @@
+@@ -22956,8 +23743,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10099,7 +9951,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23023,8 +23809,7 @@
+@@ -23025,8 +23811,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10109,7 +9961,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23119,8 +23904,7 @@
+@@ -23121,8 +23906,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10119,7 +9971,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23184,8 +23968,7 @@
+@@ -23186,8 +23970,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10129,7 +9981,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23280,8 +24063,7 @@
+@@ -23282,8 +24065,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10139,7 +9991,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23345,8 +24127,7 @@
+@@ -23347,8 +24129,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10149,7 +10001,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23442,8 +24223,7 @@
+@@ -23444,8 +24225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10159,7 +10011,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23507,8 +24287,7 @@
+@@ -23509,8 +24289,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10169,7 +10021,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23605,8 +24384,7 @@
+@@ -23607,8 +24386,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10179,7 +10031,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23671,8 +24449,7 @@
+@@ -23673,8 +24451,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10189,7 +10041,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23740,8 +24517,7 @@
+@@ -23742,8 +24519,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10199,7 +10051,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23892,8 +24668,7 @@
+@@ -23894,8 +24670,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10209,7 +10061,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24048,8 +24823,7 @@
+@@ -24050,8 +24825,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10219,7 +10071,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24114,8 +24888,7 @@
+@@ -24116,8 +24890,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10229,7 +10081,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24262,8 +25035,7 @@
+@@ -24264,8 +25037,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10239,7 +10091,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24418,8 +25190,7 @@
+@@ -24420,8 +25192,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10249,7 +10101,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24475,9 +25246,6 @@
+@@ -24477,9 +25248,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10259,7 +10111,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24511,8 +25279,7 @@
+@@ -24513,8 +25281,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10269,7 +10121,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24616,8 +25383,7 @@
+@@ -24618,8 +25385,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10279,7 +10131,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24717,8 +25483,7 @@
+@@ -24719,8 +25485,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10289,7 +10141,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24792,8 +25557,7 @@
+@@ -24794,8 +25559,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10299,7 +10151,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24856,8 +25620,7 @@
+@@ -24858,8 +25622,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10309,7 +10161,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24919,8 +25682,7 @@
+@@ -24921,8 +25684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10319,7 +10171,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24960,8 +25722,7 @@
+@@ -24962,8 +25724,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10329,7 +10181,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25017,8 +25778,7 @@
+@@ -25019,8 +25780,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10339,7 +10191,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25058,8 +25818,7 @@
+@@ -25060,8 +25820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10349,7 +10201,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25123,8 +25882,7 @@
+@@ -25125,8 +25884,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10359,7 +10211,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25155,10 +25913,8 @@
+@@ -25157,10 +25915,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10372,7 +10224,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25269,8 +26025,7 @@
+@@ -25271,8 +26027,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10382,7 +10234,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25332,8 +26087,7 @@
+@@ -25334,8 +26089,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10392,7 +10244,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25373,8 +26127,7 @@
+@@ -25375,8 +26129,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10402,7 +10254,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25430,8 +26183,7 @@
+@@ -25432,8 +26185,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10412,7 +10264,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25471,8 +26223,7 @@
+@@ -25473,8 +26225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10422,7 +10274,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25536,8 +26287,7 @@
+@@ -25538,8 +26289,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10432,7 +10284,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25568,10 +26318,8 @@
+@@ -25570,10 +26320,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10445,7 +10297,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25682,8 +26430,7 @@
+@@ -25684,8 +26432,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10455,7 +10307,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25745,8 +26492,7 @@
+@@ -25747,8 +26494,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10465,7 +10317,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25786,8 +26532,7 @@
+@@ -25788,8 +26534,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10475,7 +10327,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25843,8 +26588,7 @@
+@@ -25845,8 +26590,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10485,7 +10337,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25884,8 +26628,7 @@
+@@ -25886,8 +26630,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10495,7 +10347,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25949,8 +26692,7 @@
+@@ -25951,8 +26694,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10505,7 +10357,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25981,10 +26723,8 @@
+@@ -25983,10 +26725,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10518,7 +10370,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26095,8 +26835,7 @@
+@@ -26097,8 +26837,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10528,7 +10380,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26158,8 +26897,7 @@
+@@ -26160,8 +26899,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10538,7 +10390,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26199,8 +26937,7 @@
+@@ -26201,8 +26939,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10548,7 +10400,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26256,8 +26993,7 @@
+@@ -26258,8 +26995,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10558,7 +10410,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26297,8 +27033,7 @@
+@@ -26299,8 +27035,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10568,7 +10420,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26362,8 +27097,7 @@
+@@ -26364,8 +27099,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10578,7 +10430,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26394,10 +27128,8 @@
+@@ -26396,10 +27130,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10591,7 +10443,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26516,8 +27248,7 @@
+@@ -26518,8 +27250,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10601,7 +10453,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26588,8 +27319,7 @@
+@@ -26590,8 +27321,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10611,7 +10463,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26659,8 +27389,7 @@
+@@ -26661,8 +27391,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10621,7 +10473,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26722,8 +27451,7 @@
+@@ -26724,8 +27453,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10631,7 +10483,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26763,8 +27491,7 @@
+@@ -26765,8 +27493,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10641,7 +10493,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26820,8 +27547,7 @@
+@@ -26822,8 +27549,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10651,7 +10503,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26861,8 +27587,7 @@
+@@ -26863,8 +27589,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10661,7 +10513,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26926,8 +27651,7 @@
+@@ -26928,8 +27653,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10671,7 +10523,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26958,10 +27682,8 @@
+@@ -26960,10 +27684,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10684,7 +10536,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27073,8 +27795,7 @@
+@@ -27075,8 +27797,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10694,7 +10546,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27136,8 +27857,7 @@
+@@ -27138,8 +27859,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10704,7 +10556,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27177,8 +27897,7 @@
+@@ -27179,8 +27899,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10714,7 +10566,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27234,8 +27953,7 @@
+@@ -27236,8 +27955,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10724,7 +10576,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27275,8 +27993,7 @@
+@@ -27277,8 +27995,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10734,7 +10586,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27340,8 +28057,7 @@
+@@ -27342,8 +28059,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10744,7 +10596,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27372,10 +28088,8 @@
+@@ -27374,10 +28090,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10757,7 +10609,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27486,8 +28200,7 @@
+@@ -27488,8 +28202,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10767,7 +10619,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27568,8 +28281,7 @@
+@@ -27570,8 +28283,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10777,7 +10629,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27669,8 +28381,7 @@
+@@ -27671,8 +28383,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10787,7 +10639,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27850,8 +28561,7 @@
+@@ -27852,8 +28563,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10797,7 +10649,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27960,8 +28670,7 @@
+@@ -27962,8 +28672,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10807,7 +10659,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28185,8 +28894,7 @@
+@@ -28187,8 +28896,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10817,7 +10669,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28409,8 +29117,7 @@
+@@ -28411,8 +29119,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10827,7 +10679,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28486,8 +29193,7 @@
+@@ -28488,8 +29195,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10837,7 +10689,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28713,8 +29419,7 @@
+@@ -28715,8 +29421,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10847,7 +10699,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28789,8 +29494,7 @@
+@@ -28791,8 +29496,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10857,7 +10709,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28850,8 +29554,7 @@
+@@ -28852,8 +29556,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10867,7 +10719,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28934,8 +29637,7 @@
+@@ -28936,8 +29639,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10877,7 +10729,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29028,8 +29730,7 @@
+@@ -29030,8 +29732,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10887,7 +10739,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29203,8 +29904,7 @@
+@@ -29205,8 +29906,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10897,7 +10749,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29302,8 +30002,7 @@
+@@ -29304,8 +30004,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10907,7 +10759,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29390,8 +30089,7 @@
+@@ -29392,8 +30091,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10917,7 +10769,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29468,8 +30166,7 @@
+@@ -29470,8 +30168,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10927,25 +10779,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29522,7 +30219,7 @@
+@@ -29524,7 +30221,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29525: $i/$j" >&5
-+    echo "configure: 30222: $i/$j" >&5
+-    echo "configure: 29527: $i/$j" >&5
++    echo "configure: 30224: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29820,7 +30517,7 @@
+@@ -29822,7 +30519,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29823: $i/$j" >&5
-+    echo "configure: 30520: $i/$j" >&5
+-    echo "configure: 29825: $i/$j" >&5
++    echo "configure: 30522: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30497,8 +31194,7 @@
+@@ -30499,8 +31196,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10955,398 +10807,82 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30657,7 +31353,7 @@
+@@ -30659,7 +31355,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30660: $i/$j" >&5
-+    echo "configure: 31356: $i/$j" >&5
+-    echo "configure: 30662: $i/$j" >&5
++    echo "configure: 31358: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30687,7 +31383,7 @@
+@@ -30689,7 +31385,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30690: $i/$j" >&5
-+    echo "configure: 31386: $i/$j" >&5
+-    echo "configure: 30692: $i/$j" >&5
++    echo "configure: 31388: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30705,7 +31401,7 @@
+@@ -30707,7 +31403,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30708: $i/$j" >&5
-+    echo "configure: 31404: $i/$j" >&5
+-    echo "configure: 30710: $i/$j" >&5
++    echo "configure: 31406: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32228,7 +32924,7 @@
+@@ -32230,7 +32926,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32231: $i/$j" >&5
-+    echo "configure: 32927: $i/$j" >&5
+-    echo "configure: 32233: $i/$j" >&5
++    echo "configure: 32929: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32388,345 +33084,6 @@
- 
- 
- 
--
--  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
--echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
--
--  if test "x$GXX" = "xyes"; then
--
--
--     ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-- #include <exception>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "GCC visibility push" >/dev/null 2>&1; then
--
--      echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--      kde_stdc_visibility_patched=yes
--else
--
--      echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--      { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
--                   visibility support. Disabling -fvisibility=hidden" >&5
--echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
--                   visibility support. Disabling -fvisibility=hidden" >&2;}
--
--      kde_stdc_visibility_patched=no
--fi
--rm -f conftest*
--
--    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
--
--
--    kde_have_gcc_visibility=no
--
--echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
--echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
--kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
--   ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--  save_CXXFLAGS="$CXXFLAGS"
--  CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--  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;
--  ;
--  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); } &&
+@@ -32488,8 +33184,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
--  { (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
--  eval "kde_cv_prog_cxx_$kde_cache=yes"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--  CXXFLAGS="$save_CXXFLAGS"
--  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
--
--
--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
-- :
--
--      kde_have_gcc_visibility=yes
--      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
--echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
--if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
--           ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--
--          safe_CXXFLAGS=$CXXFLAGS
--          CXXFLAGS="$CXXFLAGS $all_includes"
--
--          cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <qglobal.h>
--#if Q_EXPORT - 0 != 0
--/* if this compiles, then Q_EXPORT is undefined */
--/* if Q_EXPORT is nonempty, this will break compilation */
--#endif
--
--int
--main ()
--{
--/* elvis is alive */
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32584,8 +33279,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  kde_cv_val_qt_gcc_visibility_patched=no
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--kde_cv_val_qt_gcc_visibility_patched=yes
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
--          CXXFLAGS=$safe_CXXFLAGS
--          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
--
--
--
--fi
--echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
--echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
--
--      if test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--
--    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
--echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
--if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
--         ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--
--        safe_CXXFLAGS=$CXXFLAGS
--        safe_LDFLAGS=$LDFLAGS
--        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
--        LDFLAGS="$LDFLAGS -shared -fPIC"
--
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
--	  #include <string>
--          int some_function( void ) __attribute__ ((visibility("default")));
--          int some_function( void )
--          {
--	    std::string s("blafasel");
--            return 0;
--          }
--
--int
--main ()
--{
--/* elvis is alive */
--  ;
--  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=$?
+@@ -32678,8 +33372,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
--  { (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
--  kde_cv_val_gcc_visibility_bug=no
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--kde_cv_val_gcc_visibility_bug=yes
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--
--        CXXFLAGS=$safe_CXXFLAGS
--        LDFLAGS=$safe_LDFLAGS
--        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
--
--
--
--fi
--echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
--echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
--
--    if test x$kde_cv_val_gcc_visibility_bug = xno; then
--      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
--    fi
--
--
--        HAVE_GCC_VISIBILITY=1
--
--cat >>confdefs.h <<_ACEOF
--#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
--_ACEOF
--
--      fi
--
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
--
--fi
--
--  fi
--
--
- echo "$as_me:$LINENO: checking for Qt docs" >&5
- echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
- kde_qtdir=
-@@ -32740,7 +33097,7 @@
++	 { 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=$?
+@@ -32751,7 +33444,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 32743: $i/$j" >&5
-+    echo "configure: 33100: $i/$j" >&5
+-    echo "configure: 32754: $i/$j" >&5
++    echo "configure: 33447: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -32937,8 +33294,7 @@
+@@ -32948,8 +33641,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11356,7 +10892,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33010,8 +33366,7 @@
+@@ -33021,8 +33713,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11366,7 +10902,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33065,8 +33420,7 @@
+@@ -33076,8 +33767,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11376,7 +10912,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33137,8 +33491,7 @@
+@@ -33148,8 +33838,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11386,7 +10922,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33192,8 +33545,7 @@
+@@ -33203,8 +33892,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11396,7 +10932,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33260,8 +33612,7 @@
+@@ -33271,8 +33959,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11406,7 +10942,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33436,8 +33787,7 @@
+@@ -33447,8 +34134,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11416,7 +10952,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33575,9 +33925,6 @@
+@@ -33586,9 +34272,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11426,7 +10962,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33608,8 +33955,7 @@
+@@ -33619,8 +34302,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11436,7 +10972,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33710,8 +34056,7 @@
+@@ -33721,8 +34403,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11446,7 +10982,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33790,9 +34135,6 @@
+@@ -33801,9 +34482,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11456,7 +10992,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33823,8 +34165,7 @@
+@@ -33834,8 +34512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11466,7 +11002,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33925,8 +34266,7 @@
+@@ -33936,8 +34613,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11476,7 +11012,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34054,9 +34394,6 @@
+@@ -34065,9 +34741,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11486,7 +11022,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34091,8 +34428,7 @@
+@@ -34102,8 +34775,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11496,7 +11032,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34199,8 +34535,7 @@
+@@ -34210,8 +34882,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11506,7 +11042,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34291,8 +34626,7 @@
+@@ -34302,8 +34973,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11516,7 +11052,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34477,8 +34811,7 @@
+@@ -34488,8 +35158,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11526,7 +11062,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34632,8 +34965,7 @@
+@@ -34643,8 +35312,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11536,7 +11072,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34708,8 +35040,7 @@
+@@ -34719,8 +35387,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11546,7 +11082,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34798,8 +35129,7 @@
+@@ -34809,8 +35476,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11556,7 +11092,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34872,8 +35202,7 @@
+@@ -34883,8 +35549,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11566,7 +11102,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34946,8 +35275,7 @@
+@@ -34957,8 +35622,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11576,15 +11112,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34986,6 +35314,7 @@
- kcalc_gmp_found=yes
- LIBGMP=
- 
-+
-    kde_safe_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $all_includes"
- 
-@@ -35029,8 +35358,7 @@
+@@ -35040,8 +35704,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11594,7 +11122,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35179,8 +35507,7 @@
+@@ -35190,8 +35853,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11604,7 +11132,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35359,8 +35686,7 @@
+@@ -35370,8 +36032,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11614,7 +11142,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35450,8 +35776,7 @@
+@@ -35461,8 +36122,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11624,7 +11152,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35602,8 +35927,7 @@
+@@ -35613,8 +36273,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11634,7 +11162,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35692,8 +36016,7 @@
+@@ -35703,8 +36362,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11644,7 +11172,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35735,8 +36058,7 @@
+@@ -35746,8 +36404,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11654,7 +11182,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35793,8 +36115,7 @@
+@@ -35804,8 +36461,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11664,7 +11192,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35996,8 +36317,7 @@
+@@ -36007,8 +36663,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11674,7 +11202,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36186,8 +36506,7 @@
+@@ -36197,8 +36852,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11684,7 +11212,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36274,8 +36593,7 @@
+@@ -36285,8 +36939,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11694,7 +11222,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36395,8 +36713,7 @@
+@@ -36406,8 +37059,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11704,7 +11232,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36589,8 +36906,7 @@
+@@ -36600,8 +37252,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11714,7 +11242,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36667,8 +36983,7 @@
+@@ -36678,8 +37329,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11724,7 +11252,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36754,8 +37069,7 @@
+@@ -36765,8 +37415,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11734,7 +11262,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36927,8 +37241,7 @@
+@@ -36938,8 +37587,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11744,7 +11272,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36997,8 +37310,7 @@
+@@ -37008,8 +37656,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11754,7 +11282,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37077,8 +37389,7 @@
+@@ -37088,8 +37735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11764,7 +11292,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37262,8 +37573,7 @@
+@@ -37273,8 +37919,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11774,7 +11302,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37351,8 +37661,7 @@
+@@ -37362,8 +38007,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11784,7 +11312,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37522,8 +37831,7 @@
+@@ -37533,8 +38177,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11794,7 +11322,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37611,8 +37919,7 @@
+@@ -37622,8 +38265,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11804,7 +11332,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37710,8 +38017,7 @@
+@@ -37721,8 +38363,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11814,7 +11342,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37753,8 +38059,7 @@
+@@ -37764,8 +38405,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11824,7 +11352,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37811,8 +38116,7 @@
+@@ -37822,8 +38462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11834,331 +11362,331 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38007,7 +38311,7 @@
+@@ -38018,7 +38657,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38010: $i/$j" >&5
-+    echo "configure: 38314: $i/$j" >&5
+-    echo "configure: 38021: $i/$j" >&5
++    echo "configure: 38660: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38023,7 +38327,7 @@
+@@ -38034,7 +38673,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38026: $i/$j" >&5
-+    echo "configure: 38330: $i/$j" >&5
+-    echo "configure: 38037: $i/$j" >&5
++    echo "configure: 38676: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38047,7 +38351,7 @@
+@@ -38058,7 +38697,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38050: $i/$j" >&5
-+    echo "configure: 38354: $i/$j" >&5
+-    echo "configure: 38061: $i/$j" >&5
++    echo "configure: 38700: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38063,7 +38367,7 @@
+@@ -38074,7 +38713,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38066: $i/$j" >&5
-+    echo "configure: 38370: $i/$j" >&5
+-    echo "configure: 38077: $i/$j" >&5
++    echo "configure: 38716: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38079,7 +38383,7 @@
+@@ -38090,7 +38729,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38082: $i/$j" >&5
-+    echo "configure: 38386: $i/$j" >&5
+-    echo "configure: 38093: $i/$j" >&5
++    echo "configure: 38732: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38107,7 +38411,7 @@
+@@ -38118,7 +38757,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38110: $i/$j" >&5
-+    echo "configure: 38414: $i/$j" >&5
+-    echo "configure: 38121: $i/$j" >&5
++    echo "configure: 38760: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38151,7 +38455,7 @@
+@@ -38162,7 +38801,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38154: $i/$j" >&5
-+    echo "configure: 38458: $i/$j" >&5
+-    echo "configure: 38165: $i/$j" >&5
++    echo "configure: 38804: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38167,7 +38471,7 @@
+@@ -38178,7 +38817,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38170: $i/$j" >&5
-+    echo "configure: 38474: $i/$j" >&5
+-    echo "configure: 38181: $i/$j" >&5
++    echo "configure: 38820: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38191,7 +38495,7 @@
+@@ -38202,7 +38841,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38194: $i/$j" >&5
-+    echo "configure: 38498: $i/$j" >&5
+-    echo "configure: 38205: $i/$j" >&5
++    echo "configure: 38844: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38207,7 +38511,7 @@
+@@ -38218,7 +38857,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38210: $i/$j" >&5
-+    echo "configure: 38514: $i/$j" >&5
+-    echo "configure: 38221: $i/$j" >&5
++    echo "configure: 38860: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38223,7 +38527,7 @@
+@@ -38234,7 +38873,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38226: $i/$j" >&5
-+    echo "configure: 38530: $i/$j" >&5
+-    echo "configure: 38237: $i/$j" >&5
++    echo "configure: 38876: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38251,7 +38555,7 @@
+@@ -38262,7 +38901,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38254: $i/$j" >&5
-+    echo "configure: 38558: $i/$j" >&5
+-    echo "configure: 38265: $i/$j" >&5
++    echo "configure: 38904: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38295,7 +38599,7 @@
+@@ -38306,7 +38945,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38298: $i/$j" >&5
-+    echo "configure: 38602: $i/$j" >&5
+-    echo "configure: 38309: $i/$j" >&5
++    echo "configure: 38948: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38311,7 +38615,7 @@
+@@ -38322,7 +38961,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38314: $i/$j" >&5
-+    echo "configure: 38618: $i/$j" >&5
+-    echo "configure: 38325: $i/$j" >&5
++    echo "configure: 38964: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38335,7 +38639,7 @@
+@@ -38346,7 +38985,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38338: $i/$j" >&5
-+    echo "configure: 38642: $i/$j" >&5
+-    echo "configure: 38349: $i/$j" >&5
++    echo "configure: 38988: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38351,7 +38655,7 @@
+@@ -38362,7 +39001,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38354: $i/$j" >&5
-+    echo "configure: 38658: $i/$j" >&5
+-    echo "configure: 38365: $i/$j" >&5
++    echo "configure: 39004: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38367,7 +38671,7 @@
+@@ -38378,7 +39017,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38370: $i/$j" >&5
-+    echo "configure: 38674: $i/$j" >&5
+-    echo "configure: 38381: $i/$j" >&5
++    echo "configure: 39020: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38395,7 +38699,7 @@
+@@ -38406,7 +39045,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38398: $i/$j" >&5
-+    echo "configure: 38702: $i/$j" >&5
+-    echo "configure: 38409: $i/$j" >&5
++    echo "configure: 39048: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38439,7 +38743,7 @@
+@@ -38450,7 +39089,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38442: $i/$j" >&5
-+    echo "configure: 38746: $i/$j" >&5
+-    echo "configure: 38453: $i/$j" >&5
++    echo "configure: 39092: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38455,7 +38759,7 @@
+@@ -38466,7 +39105,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38458: $i/$j" >&5
-+    echo "configure: 38762: $i/$j" >&5
+-    echo "configure: 38469: $i/$j" >&5
++    echo "configure: 39108: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38479,7 +38783,7 @@
+@@ -38490,7 +39129,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38482: $i/$j" >&5
-+    echo "configure: 38786: $i/$j" >&5
+-    echo "configure: 38493: $i/$j" >&5
++    echo "configure: 39132: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38495,7 +38799,7 @@
+@@ -38506,7 +39145,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38498: $i/$j" >&5
-+    echo "configure: 38802: $i/$j" >&5
+-    echo "configure: 38509: $i/$j" >&5
++    echo "configure: 39148: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38511,7 +38815,7 @@
+@@ -38522,7 +39161,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38514: $i/$j" >&5
-+    echo "configure: 38818: $i/$j" >&5
+-    echo "configure: 38525: $i/$j" >&5
++    echo "configure: 39164: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38539,7 +38843,7 @@
+@@ -38550,7 +39189,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38542: $i/$j" >&5
-+    echo "configure: 38846: $i/$j" >&5
+-    echo "configure: 38553: $i/$j" >&5
++    echo "configure: 39192: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38583,7 +38887,7 @@
+@@ -38594,7 +39233,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38586: $i/$j" >&5
-+    echo "configure: 38890: $i/$j" >&5
+-    echo "configure: 38597: $i/$j" >&5
++    echo "configure: 39236: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38599,7 +38903,7 @@
+@@ -38610,7 +39249,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38602: $i/$j" >&5
-+    echo "configure: 38906: $i/$j" >&5
+-    echo "configure: 38613: $i/$j" >&5
++    echo "configure: 39252: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38623,7 +38927,7 @@
+@@ -38634,7 +39273,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38626: $i/$j" >&5
-+    echo "configure: 38930: $i/$j" >&5
+-    echo "configure: 38637: $i/$j" >&5
++    echo "configure: 39276: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38639,7 +38943,7 @@
+@@ -38650,7 +39289,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38642: $i/$j" >&5
-+    echo "configure: 38946: $i/$j" >&5
+-    echo "configure: 38653: $i/$j" >&5
++    echo "configure: 39292: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38655,7 +38959,7 @@
+@@ -38666,7 +39305,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38658: $i/$j" >&5
-+    echo "configure: 38962: $i/$j" >&5
+-    echo "configure: 38669: $i/$j" >&5
++    echo "configure: 39308: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38683,7 +38987,7 @@
+@@ -38694,7 +39333,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38686: $i/$j" >&5
-+    echo "configure: 38990: $i/$j" >&5
+-    echo "configure: 38697: $i/$j" >&5
++    echo "configure: 39336: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38727,7 +39031,7 @@
+@@ -38738,7 +39377,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38730: $i/$j" >&5
-+    echo "configure: 39034: $i/$j" >&5
+-    echo "configure: 38741: $i/$j" >&5
++    echo "configure: 39380: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38743,7 +39047,7 @@
+@@ -38754,7 +39393,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38746: $i/$j" >&5
-+    echo "configure: 39050: $i/$j" >&5
+-    echo "configure: 38757: $i/$j" >&5
++    echo "configure: 39396: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38767,7 +39071,7 @@
+@@ -38778,7 +39417,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38770: $i/$j" >&5
-+    echo "configure: 39074: $i/$j" >&5
+-    echo "configure: 38781: $i/$j" >&5
++    echo "configure: 39420: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38783,7 +39087,7 @@
+@@ -38794,7 +39433,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38786: $i/$j" >&5
-+    echo "configure: 39090: $i/$j" >&5
+-    echo "configure: 38797: $i/$j" >&5
++    echo "configure: 39436: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38799,7 +39103,7 @@
+@@ -38810,7 +39449,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38802: $i/$j" >&5
-+    echo "configure: 39106: $i/$j" >&5
+-    echo "configure: 38813: $i/$j" >&5
++    echo "configure: 39452: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38827,7 +39131,7 @@
+@@ -38838,7 +39477,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38830: $i/$j" >&5
-+    echo "configure: 39134: $i/$j" >&5
+-    echo "configure: 38841: $i/$j" >&5
++    echo "configure: 39480: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38903,8 +39207,7 @@
+@@ -38914,8 +39553,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12168,7 +11696,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39000,8 +39303,7 @@
+@@ -39011,8 +39649,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12178,7 +11706,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39097,8 +39399,7 @@
+@@ -39108,8 +39745,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12188,7 +11716,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39194,8 +39495,7 @@
+@@ -39205,8 +39841,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12198,7 +11726,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39291,8 +39591,7 @@
+@@ -39302,8 +39937,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12208,7 +11736,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39388,8 +39687,7 @@
+@@ -39399,8 +40033,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12218,7 +11746,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39485,8 +39783,7 @@
+@@ -39496,8 +40129,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12228,7 +11756,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39582,8 +39879,7 @@
+@@ -39593,8 +40225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12238,7 +11766,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39679,8 +39975,7 @@
+@@ -39690,8 +40321,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12248,7 +11776,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39776,8 +40071,7 @@
+@@ -39787,8 +40417,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12258,7 +11786,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39873,8 +40167,7 @@
+@@ -39884,8 +40513,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12268,7 +11796,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39970,8 +40263,7 @@
+@@ -39981,8 +40609,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12278,7 +11806,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40067,8 +40359,7 @@
+@@ -40078,8 +40705,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12288,7 +11816,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40186,8 +40477,7 @@
+@@ -40197,8 +40823,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12298,7 +11826,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40283,8 +40573,7 @@
+@@ -40294,8 +40919,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12308,7 +11836,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40380,8 +40669,7 @@
+@@ -40391,8 +41015,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12318,7 +11846,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40477,8 +40765,7 @@
+@@ -40488,8 +41111,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12328,7 +11856,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40574,8 +40861,7 @@
+@@ -40585,8 +41207,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12338,7 +11866,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40671,8 +40957,7 @@
+@@ -40682,8 +41303,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12348,7 +11876,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40768,8 +41053,7 @@
+@@ -40779,8 +41399,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12358,7 +11886,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40865,8 +41149,7 @@
+@@ -40876,8 +41495,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12368,7 +11896,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40962,8 +41245,7 @@
+@@ -40973,8 +41591,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12378,7 +11906,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41059,8 +41341,7 @@
+@@ -41070,8 +41687,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12388,7 +11916,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41156,8 +41437,7 @@
+@@ -41167,8 +41783,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12398,7 +11926,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41253,8 +41533,7 @@
+@@ -41264,8 +41879,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12408,7 +11936,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41350,8 +41629,7 @@
+@@ -41361,8 +41975,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12418,7 +11946,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41470,8 +41748,7 @@
+@@ -41481,8 +42094,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12428,7 +11956,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41567,8 +41844,7 @@
+@@ -41578,8 +42190,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12438,7 +11966,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41664,8 +41940,7 @@
+@@ -41675,8 +42286,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12448,7 +11976,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41761,8 +42036,7 @@
+@@ -41772,8 +42382,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12458,7 +11986,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41858,8 +42132,7 @@
+@@ -41869,8 +42478,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12468,7 +11996,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41955,8 +42228,7 @@
+@@ -41966,8 +42574,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12478,7 +12006,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42052,8 +42324,7 @@
+@@ -42063,8 +42670,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12488,7 +12016,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42149,8 +42420,7 @@
+@@ -42160,8 +42766,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12498,7 +12026,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42246,8 +42516,7 @@
+@@ -42257,8 +42862,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12508,7 +12036,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42343,8 +42612,7 @@
+@@ -42354,8 +42958,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12518,7 +12046,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42440,8 +42708,7 @@
+@@ -42451,8 +43054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12528,7 +12056,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42537,8 +42804,7 @@
+@@ -42548,8 +43150,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12538,7 +12066,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42634,8 +42900,7 @@
+@@ -42645,8 +43246,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12548,7 +12076,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42754,8 +43019,7 @@
+@@ -42765,8 +43365,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12558,7 +12086,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42851,8 +43115,7 @@
+@@ -42862,8 +43461,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12568,7 +12096,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42948,8 +43211,7 @@
+@@ -42959,8 +43557,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12578,7 +12106,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43045,8 +43307,7 @@
+@@ -43056,8 +43653,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12588,7 +12116,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43142,8 +43403,7 @@
+@@ -43153,8 +43749,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12598,7 +12126,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43239,8 +43499,7 @@
+@@ -43250,8 +43845,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12608,7 +12136,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43336,8 +43595,7 @@
+@@ -43347,8 +43941,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12618,7 +12146,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43433,8 +43691,7 @@
+@@ -43444,8 +44037,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12628,7 +12156,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43530,8 +43787,7 @@
+@@ -43541,8 +44133,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12638,7 +12166,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43627,8 +43883,7 @@
+@@ -43638,8 +44229,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12648,7 +12176,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43724,8 +43979,7 @@
+@@ -43735,8 +44325,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12658,7 +12186,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43821,8 +44075,7 @@
+@@ -43832,8 +44421,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12668,7 +12196,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43918,8 +44171,7 @@
+@@ -43929,8 +44517,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12678,7 +12206,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44038,8 +44290,7 @@
+@@ -44049,8 +44636,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12688,7 +12216,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44135,8 +44386,7 @@
+@@ -44146,8 +44732,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12698,7 +12226,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44232,8 +44482,7 @@
+@@ -44243,8 +44828,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12708,7 +12236,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44329,8 +44578,7 @@
+@@ -44340,8 +44924,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12718,7 +12246,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44426,8 +44674,7 @@
+@@ -44437,8 +45020,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12728,7 +12256,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44523,8 +44770,7 @@
+@@ -44534,8 +45116,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12738,7 +12266,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44620,8 +44866,7 @@
+@@ -44631,8 +45212,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12748,7 +12276,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44717,8 +44962,7 @@
+@@ -44728,8 +45308,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12758,7 +12286,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44814,8 +45058,7 @@
+@@ -44825,8 +45404,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12768,7 +12296,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44911,8 +45154,7 @@
+@@ -44922,8 +45500,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12778,7 +12306,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45008,8 +45250,7 @@
+@@ -45019,8 +45596,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12788,7 +12316,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45105,8 +45346,7 @@
+@@ -45116,8 +45692,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12798,7 +12326,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45202,8 +45442,7 @@
+@@ -45213,8 +45788,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12808,7 +12336,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45322,8 +45561,7 @@
+@@ -45333,8 +45907,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12818,7 +12346,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45419,8 +45657,7 @@
+@@ -45430,8 +46003,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12828,7 +12356,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45516,8 +45753,7 @@
+@@ -45527,8 +46099,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12838,7 +12366,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45613,8 +45849,7 @@
+@@ -45624,8 +46195,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12848,7 +12376,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45710,8 +45945,7 @@
+@@ -45721,8 +46291,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12858,7 +12386,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45807,8 +46041,7 @@
+@@ -45818,8 +46387,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12868,7 +12396,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45904,8 +46137,7 @@
+@@ -45915,8 +46483,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12878,7 +12406,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46001,8 +46233,7 @@
+@@ -46012,8 +46579,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12888,7 +12416,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46098,8 +46329,7 @@
+@@ -46109,8 +46675,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12898,7 +12426,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46195,8 +46425,7 @@
+@@ -46206,8 +46771,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12908,7 +12436,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46292,8 +46521,7 @@
+@@ -46303,8 +46867,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12918,7 +12446,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46389,8 +46617,7 @@
+@@ -46400,8 +46963,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12928,7 +12456,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46486,8 +46713,7 @@
+@@ -46497,8 +47059,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12938,7 +12466,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46603,8 +46829,7 @@
+@@ -46614,8 +47175,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12948,7 +12476,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46705,8 +46930,7 @@
+@@ -46716,8 +47276,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12958,7 +12486,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46772,8 +46996,7 @@
+@@ -46783,8 +47342,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12968,7 +12496,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47359,6 +47582,13 @@
+@@ -47370,6 +47928,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -12982,7 +12510,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
-@@ -48263,6 +48493,9 @@
+@@ -48274,6 +48839,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -12992,7 +12520,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -48677,11 +48910,6 @@
+@@ -48688,11 +49256,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -13004,7 +12532,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -48720,6 +48948,12 @@
+@@ -48731,6 +49294,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -13019,17 +12547,15 @@
    sed "$ac_vpsub
 --- configure.in
 +++ configure.in
-@@ -40,7 +40,9 @@
- AC_ARG_PROGRAM
- 
+@@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
--AM_INIT_AUTOMAKE(kdeutils, "3.5") dnl searches for some needed programs
-+AM_INIT_AUTOMAKE(kdeutils-rc1, "3.5") dnl searches for some needed programs
-+
-+AM_MAINTAINER_MODE
+ AM_INIT_AUTOMAKE(kdeutils, "3.5.0") dnl searches for some needed programs
  
++AM_MAINTAINER_MODE
++
  KDE_SET_PREFIX
  
+ dnl generate the config header
 --- doc/ark/Makefile.in
 +++ doc/ark/Makefile.in
 @@ -175,6 +175,9 @@




More information about the pkg-kde-commits mailing list